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.66 by jsr166, Mon Mar 18 05:37:20 2013 UTC vs.
Revision 1.67 by dl, Mon Mar 18 18:07:39 2013 UTC

#	Line 575 | Line 575 | public class CompletableFuture<T> implem
575		u = null;
576		else {
577		Object r = fr.result;
578	+	if (r == null)
579	+	r = fr.waitingGet(false);
580		if (r instanceof AltResult) {
581		ex = ((AltResult)r).ex;
582		u = null;

Diff Legend

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