ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/ForkJoinTask.java
(Generate patch)

Comparing jsr166/src/jsr166y/ForkJoinTask.java (file contents):
Revision 1.55 by dl, Sun Aug 29 23:34:46 2010 UTC vs.
Revision 1.56 by jsr166, Sat Sep 4 00:21:31 2010 UTC

# Line 205 | Line 205 | public abstract class ForkJoinTask<V> im
205      }
206  
207      /**
208 <     * Record exception and set exceptional completion
208 >     * Records exception and sets exceptional completion.
209 >     *
210       * @return status on exit
211       */
212      private void setExceptionalCompletion(Throwable rex) {
# Line 338 | Line 339 | public abstract class ForkJoinTask<V> im
339  
340      /**
341       * Commences performing this task, awaits its completion if
342 <     * necessary, and return its result, or throws an (unchecked)
342 >     * necessary, and returns its result, or throws an (unchecked)
343       * exception if the underlying computation did so.
344       *
345       * @return the computed result
# Line 534 | Line 535 | public abstract class ForkJoinTask<V> im
535      }
536  
537      /**
538 <     * Cancels ignoring exceptions if worker is terminating
538 >     * Cancels if current thread is a terminating worker thread,
539 >     * ignoring any exceptions thrown by cancel.
540       */
541      final void cancelIfTerminating() {
542          Thread t = Thread.currentThread();
# Line 1093 | Line 1095 | public abstract class ForkJoinTask<V> im
1095      private static final long serialVersionUID = -7721805057305804111L;
1096  
1097      /**
1098 <     * Saves the state to a stream.
1098 >     * Saves the state to a stream (that is, serializes it).
1099       *
1100       * @serialData the current run status and the exception thrown
1101       * during execution, or {@code null} if none
# Line 1106 | Line 1108 | public abstract class ForkJoinTask<V> im
1108      }
1109  
1110      /**
1111 <     * Reconstitutes the instance from a stream.
1111 >     * Reconstitutes the instance from a stream (that is, deserializes it).
1112       *
1113       * @param s the stream
1114       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines