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.79 by jsr166, Fri Jun 10 18:10:53 2011 UTC vs.
Revision 1.80 by jsr166, Fri Jul 1 18:30:14 2011 UTC

# Line 161 | Line 161 | public abstract class ForkJoinTask<V> im
161       * See the internal documentation of class ForkJoinPool for a
162       * general implementation overview.  ForkJoinTasks are mainly
163       * responsible for maintaining their "status" field amidst relays
164 <     * to methods in ForkJoinWorkerThread and ForkJoinPool. The
165 <     * methods of this class are more-or-less layered into (1) basic
166 <     * status maintenance (2) execution and awaiting completion (3)
167 <     * user-level methods that additionally report results. This is
168 <     * sometimes hard to see because this file orders exported methods
169 <     * in a way that flows well in javadocs.
164 >     * to methods in ForkJoinWorkerThread and ForkJoinPool.
165 >     *
166 >     * The methods of this class are more-or-less layered into
167 >     * (1) basic status maintenance
168 >     * (2) execution and awaiting completion
169 >     * (3) user-level methods that additionally report results.
170 >     * This is sometimes hard to see because this file orders exported
171 >     * methods in a way that flows well in javadocs.
172       */
173  
174      /*
# Line 693 | Line 695 | public abstract class ForkJoinTask<V> im
695              if (t != null) {
696                  if (ex != null)
697                      t.cancel(false);
698 <                else if (t.doJoin() < NORMAL && ex == null)
698 >                else if (t.doJoin() < NORMAL)
699                      ex = t.getException();
700              }
701          }
# Line 750 | Line 752 | public abstract class ForkJoinTask<V> im
752              if (t != null) {
753                  if (ex != null)
754                      t.cancel(false);
755 <                else if (t.doJoin() < NORMAL && ex == null)
755 >                else if (t.doJoin() < NORMAL)
756                      ex = t.getException();
757              }
758          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines