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.73 by jsr166, Tue Mar 19 17:04:36 2013 UTC vs.
Revision 1.74 by jsr166, Tue Mar 19 17:14:34 2013 UTC

# Line 2278 | Line 2278 | public class CompletableFuture<T> implem
2278       * CompletableFuture's result.
2279       *
2280       * <p>If this and/or the other CompletableFuture complete
2281 <     * exceptionally, or the supplied function throws an exception,
2282 <     * then the returned CompletableFuture may also do so, with a
2283 <     * CompletionException holding one of these exceptions as its
2284 <     * cause.  No guarantees are made about which result or exception
2285 <     * is used in the returned CompletableFuture.
2281 >     * exceptionally, then the returned CompletableFuture may also do so,
2282 >     * with a CompletionException holding one of these exceptions as its
2283 >     * cause.  No guarantees are made about which result or exception is
2284 >     * used in the returned CompletableFuture.  If the supplied function
2285 >     * throws an exception, then the returned CompletableFuture completes
2286 >     * exceptionally with a CompletionException holding the exception as
2287 >     * its cause.
2288       *
2289       * @param other the other CompletableFuture
2290       * @param fn the function to use to compute the value of
# Line 2303 | Line 2305 | public class CompletableFuture<T> implem
2305       * {@link ForkJoinPool#commonPool()}.
2306       *
2307       * <p>If this and/or the other CompletableFuture complete
2308 <     * exceptionally, or the supplied function throws an exception,
2309 <     * then the returned CompletableFuture may also do so, with a
2310 <     * CompletionException holding one of these exceptions as its
2311 <     * cause.  No guarantees are made about which result or exception
2312 <     * is used in the returned CompletableFuture.
2308 >     * exceptionally, then the returned CompletableFuture may also do so,
2309 >     * with a CompletionException holding one of these exceptions as its
2310 >     * cause.  No guarantees are made about which result or exception is
2311 >     * used in the returned CompletableFuture.  If the supplied function
2312 >     * throws an exception, then the returned CompletableFuture completes
2313 >     * exceptionally with a CompletionException holding the exception as
2314 >     * its cause.
2315       *
2316       * @param other the other CompletableFuture
2317       * @param fn the function to use to compute the value of
# Line 2328 | Line 2332 | public class CompletableFuture<T> implem
2332       * given executor.
2333       *
2334       * <p>If this and/or the other CompletableFuture complete
2335 <     * exceptionally, or the supplied function throws an exception,
2336 <     * then the returned CompletableFuture may also do so, with a
2337 <     * CompletionException holding one of these exceptions as its
2338 <     * cause.  No guarantees are made about which result or exception
2339 <     * is used in the returned CompletableFuture.
2335 >     * exceptionally, then the returned CompletableFuture may also do so,
2336 >     * with a CompletionException holding one of these exceptions as its
2337 >     * cause.  No guarantees are made about which result or exception is
2338 >     * used in the returned CompletableFuture.  If the supplied function
2339 >     * throws an exception, then the returned CompletableFuture completes
2340 >     * exceptionally with a CompletionException holding the exception as
2341 >     * its cause.
2342       *
2343       * @param other the other CompletableFuture
2344       * @param fn the function to use to compute the value of
# Line 2407 | Line 2413 | public class CompletableFuture<T> implem
2413       * or the other CompletableFuture's result.
2414       *
2415       * <p>If this and/or the other CompletableFuture complete
2416 <     * exceptionally, or the supplied action throws an exception,
2417 <     * then the returned CompletableFuture may also do so, with a
2418 <     * CompletionException holding one of these exceptions as its
2419 <     * cause.  No guarantees are made about which result or exception
2420 <     * is used in the returned CompletableFuture.
2416 >     * exceptionally, then the returned CompletableFuture may also do so,
2417 >     * with a CompletionException holding one of these exceptions as its
2418 >     * cause.  No guarantees are made about which result or exception is
2419 >     * used in the returned CompletableFuture.  If the supplied action
2420 >     * throws an exception, then the returned CompletableFuture completes
2421 >     * exceptionally with a CompletionException holding the exception as
2422 >     * its cause.
2423       *
2424       * @param other the other CompletableFuture
2425       * @param block the action to perform before completing the
# Line 2432 | Line 2440 | public class CompletableFuture<T> implem
2440       * the {@link ForkJoinPool#commonPool()}.
2441       *
2442       * <p>If this and/or the other CompletableFuture complete
2443 <     * exceptionally, or the supplied action throws an exception,
2444 <     * then the returned CompletableFuture may also do so, with a
2445 <     * CompletionException holding one of these exceptions as its
2446 <     * cause.  No guarantees are made about which result or exception
2447 <     * is used in the returned CompletableFuture.
2443 >     * exceptionally, then the returned CompletableFuture may also do so,
2444 >     * with a CompletionException holding one of these exceptions as its
2445 >     * cause.  No guarantees are made about which result or exception is
2446 >     * used in the returned CompletableFuture.  If the supplied action
2447 >     * throws an exception, then the returned CompletableFuture completes
2448 >     * exceptionally with a CompletionException holding the exception as
2449 >     * its cause.
2450       *
2451       * @param other the other CompletableFuture
2452       * @param block the action to perform before completing the
# Line 2457 | Line 2467 | public class CompletableFuture<T> implem
2467       * the given executor.
2468       *
2469       * <p>If this and/or the other CompletableFuture complete
2470 <     * exceptionally, or the supplied action throws an exception,
2471 <     * then the returned CompletableFuture may also do so, with a
2472 <     * CompletionException holding one of these exceptions as its
2473 <     * cause.  No guarantees are made about which result or exception
2474 <     * is used in the returned CompletableFuture.
2470 >     * exceptionally, then the returned CompletableFuture may also do so,
2471 >     * with a CompletionException holding one of these exceptions as its
2472 >     * cause.  No guarantees are made about which result or exception is
2473 >     * used in the returned CompletableFuture.  If the supplied action
2474 >     * throws an exception, then the returned CompletableFuture completes
2475 >     * exceptionally with a CompletionException holding the exception as
2476 >     * its cause.
2477       *
2478       * @param other the other CompletableFuture
2479       * @param block the action to perform before completing the
# Line 2534 | Line 2546 | public class CompletableFuture<T> implem
2546       * after performing the given action.
2547       *
2548       * <p>If this and/or the other CompletableFuture complete
2549 <     * exceptionally, or the supplied action throws an exception,
2550 <     * then the returned CompletableFuture may also do so, with a
2551 <     * CompletionException holding one of these exceptions as its
2552 <     * cause.  No guarantees are made about which result or exception
2553 <     * is used in the returned CompletableFuture.
2549 >     * exceptionally, then the returned CompletableFuture may also do so,
2550 >     * with a CompletionException holding one of these exceptions as its
2551 >     * cause.  No guarantees are made about which result or exception is
2552 >     * used in the returned CompletableFuture.  If the supplied action
2553 >     * throws an exception, then the returned CompletableFuture completes
2554 >     * exceptionally with a CompletionException holding the exception as
2555 >     * its cause.
2556       *
2557       * @param other the other CompletableFuture
2558       * @param action the action to perform before completing the
# Line 2557 | Line 2571 | public class CompletableFuture<T> implem
2571       * {@link ForkJoinPool#commonPool()}.
2572       *
2573       * <p>If this and/or the other CompletableFuture complete
2574 <     * exceptionally, or the supplied action throws an exception,
2575 <     * then the returned CompletableFuture may also do so, with a
2576 <     * CompletionException holding one of these exceptions as its
2577 <     * cause.  No guarantees are made about which result or exception
2578 <     * is used in the returned CompletableFuture.
2574 >     * exceptionally, then the returned CompletableFuture may also do so,
2575 >     * with a CompletionException holding one of these exceptions as its
2576 >     * cause.  No guarantees are made about which result or exception is
2577 >     * used in the returned CompletableFuture.  If the supplied action
2578 >     * throws an exception, then the returned CompletableFuture completes
2579 >     * exceptionally with a CompletionException holding the exception as
2580 >     * its cause.
2581       *
2582       * @param other the other CompletableFuture
2583       * @param action the action to perform before completing the
# Line 2581 | Line 2597 | public class CompletableFuture<T> implem
2597       * given executor.
2598       *
2599       * <p>If this and/or the other CompletableFuture complete
2600 <     * exceptionally, or the supplied action throws an exception,
2601 <     * then the returned CompletableFuture may also do so, with a
2602 <     * CompletionException holding one of these exceptions as its
2603 <     * cause.  No guarantees are made about which result or exception
2604 <     * is used in the returned CompletableFuture.
2600 >     * exceptionally, then the returned CompletableFuture may also do so,
2601 >     * with a CompletionException holding one of these exceptions as its
2602 >     * cause.  No guarantees are made about which result or exception is
2603 >     * used in the returned CompletableFuture.  If the supplied action
2604 >     * throws an exception, then the returned CompletableFuture completes
2605 >     * exceptionally with a CompletionException holding the exception as
2606 >     * its cause.
2607       *
2608       * @param other the other CompletableFuture
2609       * @param action the action to perform before completing the

Diff Legend

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