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.86 by jsr166, Mon Apr 8 17:22:04 2013 UTC vs.
Revision 1.87 by jsr166, Mon May 20 16:16:42 2013 UTC

# Line 1180 | Line 1180 | public class CompletableFuture<T> implem
1180                  (r = a.result) != null &&
1181                  compareAndSet(0, 1)) {
1182                  if ((r instanceof AltResult) &&
1183 <                    (ex = ((AltResult)r).ex) != null)  {
1183 >                    (ex = ((AltResult)r).ex) != null) {
1184                      try {
1185                          t = fn.apply(ex);
1186                      } catch (Throwable rex) {
# Line 2863 | Line 2863 | public class CompletableFuture<T> implem
2863          if (r != null && (d == null || d.compareAndSet(0, 1))) {
2864              T t = null; Throwable ex, dx = null;
2865              if (r instanceof AltResult) {
2866 <                if ((ex = ((AltResult)r).ex) != null)  {
2866 >                if ((ex = ((AltResult)r).ex) != null) {
2867                      try {
2868                          t = fn.apply(ex);
2869                      } catch (Throwable rex) {

Diff Legend

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