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

Comparing jsr166/src/jsr166e/CompletableFuture.java (file contents):
Revision 1.16 by jsr166, Sun Mar 17 22:41:04 2013 UTC vs.
Revision 1.17 by jsr166, Mon May 20 16:16:42 2013 UTC

# Line 1053 | Line 1053 | public class CompletableFuture<T> implem
1053                  (r = a.result) != null &&
1054                  compareAndSet(0, 1)) {
1055                  if ((r instanceof AltResult) &&
1056 <                    (ex = ((AltResult)r).ex) != null)  {
1056 >                    (ex = ((AltResult)r).ex) != null) {
1057                      try {
1058                          t = fn.apply(ex);
1059                      } catch (Throwable rex) {
# Line 2526 | Line 2526 | public class CompletableFuture<T> implem
2526          if (r != null && (d == null || d.compareAndSet(0, 1))) {
2527              T t = null; Throwable ex, dx = null;
2528              if (r instanceof AltResult) {
2529 <                if ((ex = ((AltResult)r).ex) != null)  {
2529 >                if ((ex = ((AltResult)r).ex) != null) {
2530                      try {
2531                          t = fn.apply(ex);
2532                      } catch (Throwable rex) {

Diff Legend

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