[ViewVC] Diff of: jsr166/jsr166/src/main/java/util/concurrent/CompletableFuture.java

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.3 by jsr166, Thu Dec 27 20:34:50 2012 UTC vs.
Revision 1.4 by jsr166, Thu Dec 27 20:49:19 2012 UTC

#	Line 26 \| Line 26 \| import java.util.concurrent.locks.LockSu
26		* value and status), and may include dependent functions and actions
27		* that trigger upon its completion.
28		*
29	<	* <p> Similar methods are available for function-based usages in
29	>	* <p>Similar methods are available for function-based usages in
30		* which dependent stages typically propagate values, as well as
31		* result-less action-based usages, that are normally associated with
32		* {@code CompletableFuture<Void>} Futures. Functions and actions
#	Line 37 \| Line 37 \| import java.util.concurrent.locks.LockSu
37		* are no guarantees about the order of processing completions unless
38		* constrained by method {@code then} and related methods.
39		*
40	<	* <p> When two or more threads attempt to {@link #complete} or {@link
40	>	* <p>When two or more threads attempt to {@link #complete} or {@link
41		* #completeExceptionally} a CompletableFuture, only one of them will
42		* succeed. When completion entails computation of a function or
43		* action, it is executed <em>after</em> establishing precedence. If

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