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.107 by jsr166, Fri May 2 23:48:32 2014 UTC vs.
Revision 1.108 by jsr166, Fri May 2 23:54:39 2014 UTC

#	Line 209 | Line 209 | public class CompletableFuture<T> implem
209		}
210
211		/**
212	<	* Decodes outcome to return result or throw unchecked exception
212	>	* Decodes outcome to return result or throw unchecked exception.
213		*/
214		private static <T> T reportJoin(Object r) {
215		if (r instanceof AltResult) {
#	Line 227 | Line 227 | public class CompletableFuture<T> implem
227		}
228
229		/**
230	<	* Reports result using Future.get conventions
230	>	* Reports result using Future.get conventions.
231		*/
232		private static <T> T reportGet(Object r)
233		throws InterruptedException, ExecutionException {
#	Line 1941 | Line 1941 | public class CompletableFuture<T> implem
1941		}
1942
1943		/**
1944	<	* Returns this CompletableFuture
1944	>	* Returns this CompletableFuture.
1945		*
1946		* @return this CompletableFuture
1947		*/

Diff Legend

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