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

Comparing jsr166/src/main/java/util/concurrent/CompletableFuture.java (file contents):
Revision 1.171 by jsr166, Sat Sep 19 20:48:52 2015 UTC vs.
Revision 1.172 by jsr166, Mon Sep 21 01:15:10 2015 UTC

# Line 1327 | Line 1327 | public class CompletableFuture<T> implem
1327              if ((a = (lo == mid ? cfs[lo] :
1328                        andTree(cfs, lo, mid))) == null ||
1329                  (b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
1330 <                      andTree(cfs, mid+1, hi)))  == null)
1330 >                      andTree(cfs, mid+1, hi))) == null)
1331                  throw new NullPointerException();
1332              if (!d.biRelay(a, b)) {
1333                  BiRelay<?,?> c = new BiRelay<>(d, a, b);
# Line 1581 | Line 1581 | public class CompletableFuture<T> implem
1581              if ((a = (lo == mid ? cfs[lo] :
1582                        orTree(cfs, lo, mid))) == null ||
1583                  (b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
1584 <                      orTree(cfs, mid+1, hi)))  == null)
1584 >                      orTree(cfs, mid+1, hi))) == null)
1585                  throw new NullPointerException();
1586              if (!d.orRelay(a, b)) {
1587                  OrRelay<?,?> c = new OrRelay<>(d, a, b);

Diff Legend

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