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

Comparing jsr166/src/jsr166e/CompletableFuture.java (file contents):
Revision 1.14 by jsr166, Sat Feb 16 20:50:29 2013 UTC vs.
Revision 1.16 by jsr166, Sun Mar 17 22:41:04 2013 UTC

# Line 55 | Line 55 | import java.util.concurrent.locks.LockSu
55   * Executor} or by default the {@link ForkJoinPool#commonPool()}, of a
56   * function or action that will result in the completion of a new
57   * CompletableFuture. To simplify monitoring, debugging, and tracking,
58 < * all generated asynchronous tasks are instances of the tagging
58 > * all generated asynchronous tasks are instances of the marker
59   * interface {@link AsynchronousCompletionTask}.
60   *
61   * <p><em>jsr166e note: During transition, this class
# Line 380 | Line 380 | public class CompletableFuture<T> implem
380      /* ------------- Async tasks -------------- */
381  
382      /**
383 <     * A tagging interface identifying asynchronous tasks produced by
383 >     * A marker interface identifying asynchronous tasks produced by
384       * {@code async} methods. This may be useful for monitoring,
385       * debugging, and tracking asynchronous activities.
386       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines