ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/CompletableFuture.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.75 by dl, Sat Mar 23 10:58:57 2013 UTC vs.
Revision 1.76 by dl, Sat Mar 23 15:16:33 2013 UTC

# Line 3015 | Line 3015 | public class CompletableFuture<T> implem
3015      }
3016  
3017      /**
3018 <     * Returns a new CompletableFuture that is completed when any of the
3019 <     * given CompletableFutures complete, with the same result if it
3020 <     * completed normally.  Otherwise, if it completed exceptionally,
3021 <     * the returned CompletableFuture also does so, with a
3022 <     * CompletionException holding this exception as its cause.  If no
3023 <     * CompletableFutures are provided, returns an incomplete
3024 <     * CompletableFuture.
3018 >     * Returns a new CompletableFuture that is completed when any of
3019 >     * the given CompletableFutures complete.  Otherwise, if it
3020 >     * completed exceptionally, the returned CompletableFuture also
3021 >     * does so, with a CompletionException holding this exception as
3022 >     * its cause.  If no CompletableFutures are provided, returns an
3023 >     * incomplete CompletableFuture.
3024       *
3025       * @param cfs the CompletableFutures
3026       * @return a new CompletableFuture that is completed when any of the

Diff Legend

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