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.151 by jsr166, Wed Jan 14 21:40:59 2015 UTC vs.
Revision 1.152 by jsr166, Wed Jan 14 22:00:16 2015 UTC

# Line 2387 | Line 2387 | public class CompletableFuture<T> implem
2387      // jdk9 additions
2388  
2389      /**
2390 <     * Creates a new incomplete CompletableFuture of the type to be
2390 >     * Returns a new incomplete CompletableFuture of the type to be
2391       * returned by a CompletionStage method. Subclasses should
2392       * normally override this method to return an instance of the same
2393       * class as this CompletableFuture. The default implementation
# Line 2506 | Line 2506 | public class CompletableFuture<T> implem
2506       * otherwise completed before the given timeout.
2507       *
2508       * @param value the value to use upon timeout
2509 <     * @param timeout how long to wait before completing.
2509 >     * @param timeout how long to wait before completing normally
2510 >     *        with the given value, in units of {@code unit}
2511       * @param unit a {@code TimeUnit} determining how to interpret the
2512       *        {@code timeout} parameter
2513       * @return this CompletableFuture

Diff Legend

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