--- jsr166/src/jsr166e/CompletableFuture.java 2013/02/06 07:04:48 1.9 +++ jsr166/src/jsr166e/CompletableFuture.java 2013/02/06 07:51:57 1.11 @@ -2633,17 +2633,16 @@ public class CompletableFuture implem */ public boolean isCancelled() { Object r; - return ((r = result) != null && - (r instanceof AltResult) && - (((AltResult)r).ex instanceof CancellationException)); + return ((r = result) instanceof AltResult) && + (((AltResult)r).ex instanceof CancellationException); } /** * Forcibly sets or resets the value subsequently returned by - * method get() and related methods, whether or not already - * completed. This method is designed for use only in error - * recovery actions, and even in such situations may result in - * ongoing dependent completions using established versus + * method {@link #get()} and related methods, whether or not + * already completed. This method is designed for use only in + * error recovery actions, and even in such situations may result + * in ongoing dependent completions using established versus * overwritten outcomes. * * @param value the completion value