ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/CompletableFuture.java

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.35 by dl, Sat Feb 2 16:49:54 2013 UTC vs.
Revision 1.36 by jsr166, Sat Feb 2 20:39:34 2013 UTC

#	Line 2972 | Line 2972 | public class CompletableFuture<T> implem
2972		Object r = result;
2973		Throwable ex = (r != null && (r instanceof AltResult) ?
2974		((AltResult)r).ex : null);
2975	<	return id + (ex != null? "[Completed exceptionally]" :
2975	>	return id + (ex != null ? "[Completed exceptionally]" :
2976		(r != null ? "[Completed normally]" :
2977		(count == 0 ? "[Not completed]" :
2978		("[Not completed, " + count + " dependents]"))));

Diff Legend

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