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.13 by jsr166, Sat Feb 16 16:53:34 2013 UTC vs.
Revision 1.15 by jsr166, Sun Mar 17 18:23:59 2013 UTC

# 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       */
# Line 1788 | Line 1788 | public class CompletableFuture<T> implem
1788       * @param executor the executor to use for asynchronous execution
1789       * @return the new CompletableFuture
1790       */
1791 –
1791      public <U,V> CompletableFuture<V> thenCombineAsync(CompletableFuture<? extends U> other,
1792                                                         BiFun<? super T,? super U,? extends V> fn,
1793                                                         Executor executor) {

Diff Legend

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