ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/CompletableFuture.java

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.182 by jsr166, Fri Jan 29 20:06:49 2016 UTC vs.
Revision 1.183 by dl, Wed Mar 23 23:05:51 2016 UTC

#	Line 554 | Line 554 | public class CompletableFuture<T> implem
554		*/
555		final CompletableFuture<T> postFire(CompletableFuture<?> a, int mode) {
556		if (a != null && a.stack != null) {
557	<	if (mode < 0 || a.result == null)
557	>	if (a.result == null)
558		a.cleanStack();
559	<	else
559	>	else if (mode >= 0)
560		a.postComplete();
561		}
562		if (result != null && stack != null) {
#	Line 1078 | Line 1078 | public class CompletableFuture<T> implem
1078		final CompletableFuture<T> postFire(CompletableFuture<?> a,
1079		CompletableFuture<?> b, int mode) {
1080		if (b != null && b.stack != null) { // clean second source
1081	<	if (mode < 0 || b.result == null)
1081	>	if (b.result == null)
1082		b.cleanStack();
1083	<	else
1083	>	else if (mode >= 0)
1084		b.postComplete();
1085		}
1086		return postFire(a, mode);

Diff Legend

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