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.121 by jsr166, Thu May 29 06:18:26 2014 UTC vs.
Revision 1.122 by jsr166, Fri May 30 02:00:58 2014 UTC

# Line 1211 | Line 1211 | public class CompletableFuture<T> implem
1211              CompletableFuture<?> a, b;
1212              int mid = (lo + hi) >>> 1;
1213              if ((a = (lo == mid ? cfs[lo] :
1214 <                      andTree(cfs, lo,    mid))) == null ||
1214 >                      andTree(cfs, lo, mid))) == null ||
1215                  (b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
1216                        andTree(cfs, mid+1, hi)))  == null)
1217                  throw new NullPointerException();
# Line 1462 | Line 1462 | public class CompletableFuture<T> implem
1462              CompletableFuture<?> a, b;
1463              int mid = (lo + hi) >>> 1;
1464              if ((a = (lo == mid ? cfs[lo] :
1465 <                      orTree(cfs, lo,    mid))) == null ||
1465 >                      orTree(cfs, lo, mid))) == null ||
1466                  (b = (lo == hi ? a : (hi == mid+1) ? cfs[hi] :
1467                        orTree(cfs, mid+1, hi)))  == null)
1468                  throw new NullPointerException();

Diff Legend

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