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.120 by jsr166, Mon May 26 17:25:36 2014 UTC vs.
Revision 1.121 by jsr166, Thu May 29 06:18:26 2014 UTC

#	Line 1793 | Line 1793 | public class CompletableFuture<T> implem
1793		*/
1794		public T get() throws InterruptedException, ExecutionException {
1795		Object r;
1796	<	return reportGet((r = result) == null ?  waitingGet(true) : r);
1796	>	return reportGet((r = result) == null ? waitingGet(true) : r);
1797		}
1798
1799		/**
#	Line 1813 | Line 1813 | public class CompletableFuture<T> implem
1813		throws InterruptedException, ExecutionException, TimeoutException {
1814		Object r;
1815		long nanos = unit.toNanos(timeout);
1816	<	return reportGet((r = result) == null ?  timedGet(nanos) : r);
1816	>	return reportGet((r = result) == null ? timedGet(nanos) : r);
1817		}
1818
1819		/**

Diff Legend

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