ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/CompletionStage.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/CompletionStage.java (file contents):
Revision 1.37 by jsr166, Sun Jan 24 21:22:16 2016 UTC vs.
Revision 1.38 by jsr166, Wed Feb 10 23:40:07 2016 UTC

# Line 736 | Line 736 | public interface CompletionStage<T> {
736       * {@code null} if none) of this stage as arguments.  The returned
737       * stage is completed when the action returns.
738       *
739 <     * <p>Unlike method {@link #handle}, this method is not designed
740 <     * to translate completion outcomes, so the supplied action should
741 <     * not throw an exception. However, if it does, the following
742 <     * rules apply: if this stage completed normally but the supplied
743 <     * action throws an exception, then the returned stage completes
744 <     * exceptionally with the supplied action's exception. Or, if this
745 <     * stage completed exceptionally and the supplied action throws an
746 <     * exception, then the returned stage completes exceptionally with
747 <     * this stage's exception.
739 >     * <p>Unlike method {@link #handle handle},
740 >     * this method is not designed to translate completion outcomes,
741 >     * so the supplied action should not throw an exception. However,
742 >     * if it does, the following rules apply: if this stage completed
743 >     * normally but the supplied action throws an exception, then the
744 >     * returned stage completes exceptionally with the supplied
745 >     * action's exception. Or, if this stage completed exceptionally
746 >     * and the supplied action throws an exception, then the returned
747 >     * stage completes exceptionally with this stage's exception.
748       *
749       * @param action the action to perform
750       * @return the new CompletionStage
# Line 762 | Line 762 | public interface CompletionStage<T> {
762       * if none) of this stage as arguments.  The returned stage is completed
763       * when the action returns.
764       *
765 <     * <p>Unlike method {@link #handle}, this method is not designed
766 <     * to translate completion outcomes, so the supplied action should
767 <     * not throw an exception. However, if it does, the following
768 <     * rules apply: If this stage completed normally but the supplied
769 <     * action throws an exception, then the returned stage completes
770 <     * exceptionally with the supplied action's exception. Or, if this
771 <     * stage completed exceptionally and the supplied action throws an
772 <     * exception, then the returned stage completes exceptionally with
773 <     * this stage's exception.
765 >     * <p>Unlike method {@link #handleAsync(BiFunction) handleAsync},
766 >     * this method is not designed to translate completion outcomes,
767 >     * so the supplied action should not throw an exception. However,
768 >     * if it does, the following rules apply: If this stage completed
769 >     * normally but the supplied action throws an exception, then the
770 >     * returned stage completes exceptionally with the supplied
771 >     * action's exception. Or, if this stage completed exceptionally
772 >     * and the supplied action throws an exception, then the returned
773 >     * stage completes exceptionally with this stage's exception.
774       *
775       * @param action the action to perform
776       * @return the new CompletionStage
# Line 788 | Line 788 | public interface CompletionStage<T> {
788       * if none) of this stage as arguments.  The returned stage is completed
789       * when the action returns.
790       *
791 <     * <p>Unlike method {@link #handle}, this method is not designed
792 <     * to translate completion outcomes, so the supplied action should
793 <     * not throw an exception. However, if it does, the following
794 <     * rules apply: If this stage completed normally but the supplied
795 <     * action throws an exception, then the returned stage completes
796 <     * exceptionally with the supplied action's exception. Or, if this
797 <     * stage completed exceptionally and the supplied action throws an
798 <     * exception, then the returned stage completes exceptionally with
799 <     * this stage's exception.
791 >     * <p>Unlike method {@link #handleAsync(BiFunction,Executor) handleAsync},
792 >     * this method is not designed to translate completion outcomes,
793 >     * so the supplied action should not throw an exception. However,
794 >     * if it does, the following rules apply: If this stage completed
795 >     * normally but the supplied action throws an exception, then the
796 >     * returned stage completes exceptionally with the supplied
797 >     * action's exception. Or, if this stage completed exceptionally
798 >     * and the supplied action throws an exception, then the returned
799 >     * stage completes exceptionally with this stage's exception.
800       *
801       * @param action the action to perform
802       * @param executor the executor to use for asynchronous execution

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines