stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8041772: (ch) PendingFuture.CANCELLED has backtrace that potentially keeps objects alive

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2014-04-30 14:27:19 +01:00
parent 939b54d31c
commit 66ffd3bc10
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/share/classes/sun/nio/ch/PendingFuture.java
View File

@ -35,8 +35,6 @@ import java.io.IOException;
*/
final class PendingFuture<V,A> implements Future<V> {
private static final CancellationException CANCELLED =
new CancellationException();
private final AsynchronousChannel channel;
private final CompletionHandler<V,? super A> handler;
@ -180,7 +178,7 @@ final class PendingFuture<V,A> implements Future<V> {
latch.await();
}
if (exc != null) {
if (exc == CANCELLED)
if (exc instanceof CancellationException)
throw new CancellationException();
throw new ExecutionException(exc);
}
@ -197,7 +195,7 @@ final class PendingFuture<V,A> implements Future<V> {
if (!latch.await(timeout, unit)) throw new TimeoutException();
}
if (exc != null) {
if (exc == CANCELLED)
if (exc instanceof CancellationException)
throw new CancellationException();
throw new ExecutionException(exc);
}
@ -205,7 +203,7 @@ final class PendingFuture<V,A> implements Future<V> {
}
Throwable exception() {
return (exc != CANCELLED) ? exc : null;
return (exc instanceof CancellationException) ? null : exc;
}
V value() {
@ -214,7 +212,7 @@ final class PendingFuture<V,A> implements Future<V> {
@Override
public boolean isCancelled() {
return (exc == CANCELLED);
return (exc instanceof CancellationException);
}
@Override
@ -233,7 +231,7 @@ final class PendingFuture<V,A> implements Future<V> {
((Cancellable)channel()).onCancel(this);
// set result and cancel timer
exc = CANCELLED;
exc = new CancellationException();
haveResult = true;
if (timeoutTask != null)
timeoutTask.cancel(false);