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.48 by dl, Sun Feb 10 14:27:54 2013 UTC vs.
Revision 1.49 by dl, Sun Feb 10 14:30:47 2013 UTC

# Line 1408 | Line 1408 | public class CompletableFuture<T> implem
1408      }
1409  
1410      /**
1411 <     * Waits if necessary for the computation to complete, and then
1411 >     * Waits if necessary for this future to complete, and then
1412       * returns its result.
1413       *
1414       * @return the result value
# Line 1436 | Line 1436 | public class CompletableFuture<T> implem
1436      }
1437  
1438      /**
1439 <     * Waits if necessary for at most the given time for completion,
1440 <     * and then returns its result, if available.
1439 >     * Waits if necessary for at most the given time for this future
1440 >     * to complete, and then returns its result, if available.
1441       *
1442       * @param timeout the maximum time to wait
1443       * @param unit the time unit of the timeout argument

Diff Legend

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