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.58 by jsr166, Sun Mar 17 19:25:29 2013 UTC vs.
Revision 1.59 by jsr166, Sun Mar 17 19:29:39 2013 UTC

# Line 2806 | Line 2806 | public class CompletableFuture<T> implem
2806       * c3).join();}.
2807       *
2808       * @param cfs the CompletableFutures
2809 <     * @return a new CompletableFuture that is complete when all of the
2809 >     * @return a new CompletableFuture that is completed when all of the
2810       * given CompletableFutures complete
2811       * @throws NullPointerException if the array or any of its elements are
2812       * {@code null}
# Line 2897 | Line 2897 | public class CompletableFuture<T> implem
2897       * of components is zero, returns an incomplete CompletableFuture.
2898       *
2899       * @param cfs the CompletableFutures
2900 <     * @return a new CompletableFuture that is complete when any of the
2900 >     * @return a new CompletableFuture that is completed when any of the
2901       * given CompletableFutures complete
2902       * @throws NullPointerException if the array or any of its elements are
2903       * {@code null}

Diff Legend

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