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.14 by jsr166, Sun Dec 30 03:09:46 2012 UTC vs.
Revision 1.15 by jsr166, Sun Dec 30 03:43:56 2012 UTC

# Line 527 | Line 527 | public class CompletableFuture<T> implem
527       * the results of this and the other given CompletableFuture if
528       * both complete.  If this and/or the other CompletableFuture
529       * complete exceptionally, then the returned CompletableFuture
530 <     * also does so, with a RuntimeException having the one of the
530 >     * also does so, with a RuntimeException having one of these
531       * exceptions as its cause.
532       *
533       * @param other the other CompletableFuture
# Line 546 | Line 546 | public class CompletableFuture<T> implem
546       * the results of this and the other given CompletableFuture when
547       * both complete.  If this and/or the other CompletableFuture
548       * complete exceptionally, then the returned CompletableFuture
549 <     * also does so, with a RuntimeException having the one of the
549 >     * also does so, with a RuntimeException having one of these
550       * exceptions as its cause.
551       *
552       * @param other the other CompletableFuture
# Line 565 | Line 565 | public class CompletableFuture<T> implem
565       * this and the other given CompletableFuture when both complete.
566       * If this and/or the other CompletableFuture complete
567       * exceptionally, then the returned CompletableFuture also does
568 <     * so, with a RuntimeException having the one of the exceptions as
568 >     * so, with a RuntimeException having one of these exceptions as
569       * its cause.
570       *
571       * @param other the other CompletableFuture
# Line 586 | Line 586 | public class CompletableFuture<T> implem
586       * when this and the other given CompletableFuture both
587       * complete.  If this and/or the other CompletableFuture complete
588       * exceptionally, then the returned CompletableFuture also does
589 <     * so, with a RuntimeException having the one of the exceptions as
589 >     * so, with a RuntimeException having one of these exceptions as
590       * its cause.
591       *
592       * @param other the other CompletableFuture
# Line 605 | Line 605 | public class CompletableFuture<T> implem
605       * when this and the other given CompletableFuture both
606       * complete.  If this and/or the other CompletableFuture complete
607       * exceptionally, then the returned CompletableFuture also does
608 <     * so, with a RuntimeException having the one of the exceptions as
608 >     * so, with a RuntimeException having one of these exceptions as
609       * its cause.
610       *
611       * @param other the other CompletableFuture
# Line 624 | Line 624 | public class CompletableFuture<T> implem
624       * when this and the other given CompletableFuture both
625       * complete.  If this and/or the other CompletableFuture complete
626       * exceptionally, then the returned CompletableFuture also does
627 <     * so, with a RuntimeException having the one of the exceptions as
627 >     * so, with a RuntimeException having one of these exceptions as
628       * its cause.
629       *
630       * @param other the other CompletableFuture

Diff Legend

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