--- jsr166/src/jsr166e/CompletableFuture.java 2013/02/06 08:43:48 1.12
+++ jsr166/src/jsr166e/CompletableFuture.java 2013/03/17 22:41:04 1.16
@@ -55,7 +55,7 @@ import java.util.concurrent.locks.LockSu
* Executor} or by default the {@link ForkJoinPool#commonPool()}, of a
* function or action that will result in the completion of a new
* CompletableFuture. To simplify monitoring, debugging, and tracking,
- * all generated asynchronous tasks are instances of the tagging
+ * all generated asynchronous tasks are instances of the marker
* interface {@link AsynchronousCompletionTask}.
*
*
jsr166e note: During transition, this class
@@ -380,7 +380,7 @@ public class CompletableFuture implem
/* ------------- Async tasks -------------- */
/**
- * A tagging interface identifying asynchronous tasks produced by
+ * A marker interface identifying asynchronous tasks produced by
* {@code async} methods. This may be useful for monitoring,
* debugging, and tracking asynchronous activities.
*/
@@ -1788,7 +1788,6 @@ public class CompletableFuture implem
* @param executor the executor to use for asynchronous execution
* @return the new CompletableFuture
*/
-
public CompletableFuture thenCombineAsync(CompletableFuture extends U> other,
BiFun super T,? super U,? extends V> fn,
Executor executor) {
@@ -2555,7 +2554,6 @@ public class CompletableFuture implem
*
* @param fn the function to use to compute the value of the
* returned CompletableFuture
-
* @return the new CompletableFuture
*/
public CompletableFuture handle(BiFun super T, Throwable, ? extends U> fn) {