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

Comparing jsr166/src/main/java/util/concurrent/ForkJoinTask.java (file contents):
Revision 1.20 by dl, Thu Sep 2 11:31:22 2010 UTC vs.
Revision 1.21 by jsr166, Sat Sep 4 00:21:31 2010 UTC

# Line 203 | Line 203 | public abstract class ForkJoinTask<V> im
203      }
204  
205      /**
206 <     * Record exception and set exceptional completion
206 >     * Records exception and sets exceptional completion.
207 >     *
208       * @return status on exit
209       */
210      private void setExceptionalCompletion(Throwable rex) {
# Line 336 | Line 337 | public abstract class ForkJoinTask<V> im
337  
338      /**
339       * Commences performing this task, awaits its completion if
340 <     * necessary, and return its result, or throws an (unchecked)
340 >     * necessary, and returns its result, or throws an (unchecked)
341       * {@code RuntimeException} or {@code Error} if the underlying
342       * computation did so.
343       *
# Line 540 | Line 541 | public abstract class ForkJoinTask<V> im
541      }
542  
543      /**
544 <     * Cancels ignoring exceptions if worker is terminating
544 >     * Cancels if current thread is a terminating worker thread,
545 >     * ignoring any exceptions thrown by cancel.
546       */
547      final void cancelIfTerminating() {
548          Thread t = Thread.currentThread();
# Line 1099 | Line 1101 | public abstract class ForkJoinTask<V> im
1101      private static final long serialVersionUID = -7721805057305804111L;
1102  
1103      /**
1104 <     * Saves the state to a stream.
1104 >     * Saves the state to a stream (that is, serializes it).
1105       *
1106       * @serialData the current run status and the exception thrown
1107       * during execution, or {@code null} if none
# Line 1112 | Line 1114 | public abstract class ForkJoinTask<V> im
1114      }
1115  
1116      /**
1117 <     * Reconstitutes the instance from a stream.
1117 >     * Reconstitutes the instance from a stream (that is, deserializes it).
1118       *
1119       * @param s the stream
1120       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines