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.68 by dl, Tue Mar 19 00:22:08 2013 UTC vs.
Revision 1.69 by jsr166, Tue Mar 19 00:32:19 2013 UTC

# Line 2850 | Line 2850 | public class CompletableFuture<T> implem
2850      /**
2851       * Returns a new CompletableFuture that is completed when all of
2852       * the given CompletableFutures complete.  If any of the given
2853 <     * CompletableFutures complete exceptionally, then so does the
2854 <     * returned CompletableFuture. Otherwise, the results, if any, of
2855 <     * the given CompletableFutures are not reflected in the returned
2856 <     * CompletableFuture, but may be obtained by inspecting them
2857 <     * individually. If no CompletableFutures are provided, returns a
2858 <     * CompletableFuture completed with the value {@code null}.
2853 >     * CompletableFutures complete exceptionally, then the returned
2854 >     * CompletableFuture also does so, with a CompletionException
2855 >     * holding this exception as its cause.  Otherwise, the results,
2856 >     * if any, of the given CompletableFutures are not reflected in
2857 >     * the returned CompletableFuture, but may be obtained by
2858 >     * inspecting them individually. If no CompletableFutures are
2859 >     * provided, returns a CompletableFuture completed with the value
2860 >     * {@code null}.
2861       *
2862       * <p>Among the applications of this method is to await completion
2863       * of a set of independent CompletableFutures before continuing a
# Line 2948 | Line 2950 | public class CompletableFuture<T> implem
2950      }
2951  
2952      /**
2953 <     * Returns a new CompletableFuture that is completed when any of
2954 <     * the given CompletableFutures complete; with the same result if
2955 <     * it completed normally, otherwise exceptionally. If no
2953 >     * Returns a new CompletableFuture that is completed when any of the
2954 >     * given CompletableFutures complete, with the same result if it
2955 >     * completed normally.  Otherwise, if it completed exceptionally,
2956 >     * the returned CompletableFuture also does so, with a
2957 >     * CompletionException holding this exception as its cause.  If no
2958       * CompletableFutures are provided, returns an incomplete
2959       * CompletableFuture.
2960       *

Diff Legend

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