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.2 by jsr166, Thu Dec 27 20:29:07 2012 UTC vs.
Revision 1.3 by jsr166, Thu Dec 27 20:34:50 2012 UTC

#	Line 418 | Line 418 | public class CompletableFuture<T> implem
418		}
419
420		/**
421	<	* Creates and returns a CompletableFuture that is is asynchronously
421	>	* Creates and returns a CompletableFuture that is asynchronously
422		* completed using the {@link ForkJoinPool#commonPool()} with
423		* the result of the given function of this and the other given
424		* CompletableFuture's results if/when both complete.  If this or
#	Line 437 | Line 437 | public class CompletableFuture<T> implem
437		}
438
439		/**
440	<	* Creates and returns a CompletableFuture that is is
440	>	* Creates and returns a CompletableFuture that is
441		* asynchronously completed using the given executor with the
442		* result of the given function of this and the other given
443		* CompletableFuture's results if/when both complete.  If this or

Diff Legend

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