archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8331987: Enhance stacktrace clarity for CompletableFuture CancellationException

Browse source 
Reviewed-by: alanb, dfuchs
This commit is contained in:
Viktor Klang 2024-05-15 18:35:46 +00:00
parent 491b3b4563
commit 8a4315f833
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/java/util/concurrent/CancellationException.java
View file

@ -60,4 +60,16 @@ public class CancellationException extends IllegalStateException {
public CancellationException(String message) {
super(message);
}
/**
* Only intended for in-package usage.
* Constructs a {@code CancellationException} with the specified detail
* message and CancellationException cause.
*
* @param message the detail message
* @param cause the underlying cancellation exception
*/
CancellationException(String message, CancellationException cause) {
super(message, cause);
}
}

16
src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
View file

@ -380,7 +380,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
/**
* Reports result using Future.get conventions.
*/
private static Object reportGet(Object r)
private static Object reportGet(Object r, String details)
throws InterruptedException, ExecutionException {
if (r == null) // by convention below, null means interrupted
throw new InterruptedException();
@ -389,7 +389,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
if ((x = ((AltResult)r).ex) == null)
return null;
if (x instanceof CancellationException)
throw (CancellationException)x;
throw new CancellationException(details, (CancellationException)x);
if ((x instanceof CompletionException) &&
(cause = x.getCause()) != null)
x = cause;
@ -401,13 +401,13 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
/**
* Decodes outcome to return result or throw unchecked exception.
*/
private static Object reportJoin(Object r) {
private static Object reportJoin(Object r, String details) {
if (r instanceof AltResult) {
Throwable x;
if ((x = ((AltResult)r).ex) == null)
return null;
if (x instanceof CancellationException)
throw (CancellationException)x;
throw new CancellationException(details, (CancellationException)x);
if (x instanceof CompletionException)
throw (CompletionException)x;
throw new CompletionException(x);
@ -2070,7 +2070,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
Object r;
if ((r = result) == null)
r = waitingGet(true);
return (T) reportGet(r);
return (T) reportGet(r, "get");
}
/**
@ -2093,7 +2093,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
Object r;
if ((r = result) == null)
r = timedGet(nanos);
return (T) reportGet(r);
return (T) reportGet(r, "get");
}
/**
@ -2115,7 +2115,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
Object r;
if ((r = result) == null)
r = waitingGet(false);
return (T) reportJoin(r);
return (T) reportJoin(r, "join");
}
/**
@ -2131,7 +2131,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
@SuppressWarnings("unchecked")
public T getNow(T valueIfAbsent) {
Object r;
return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r);
return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r, "getNow");
}
@Override