ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/jsr166e/CompletableFuture.java

Comparing jsr166/src/jsr166e/CompletableFuture.java (file contents):
Revision 1.10 by jsr166, Wed Feb 6 07:07:48 2013 UTC vs.
Revision 1.11 by jsr166, Wed Feb 6 07:51:57 2013 UTC

#	Line 2633 | Line 2633 | public class CompletableFuture<T> implem
2633		*/
2634		public boolean isCancelled() {
2635		Object r;
2636	<	return ((r = result) != null &&
2637	<	(r instanceof AltResult) &&
2638	<	(((AltResult)r).ex instanceof CancellationException));
2636	>	return ((r = result) instanceof AltResult) &&
2637	>	(((AltResult)r).ex instanceof CancellationException);
2638		}
2639
2640		/**

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines