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.179 by dl, Sun Oct 4 11:33:47 2015 UTC vs.
Revision 1.180 by jsr166, Sun Nov 15 23:31:51 2015 UTC

# Line 771 | Line 771 | public class CompletableFuture<T> implem
771              } catch (Throwable ex) {
772                  if (x == null)
773                      x = ex;
774 +                else if (x != ex)
775 +                    x.addSuppressed(ex);
776              }
777              completeThrowable(x, r);
778          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines