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

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.62 by jsr166, Fri Jul 19 19:34:43 2013 UTC vs.
Revision 1.64 by jsr166, Mon Sep 16 14:52:48 2013 UTC

# Line 2096 | Line 2096 | public class ForkJoinPool extends Abstra
2096                      w.currentSteal = ps;
2097                  }
2098              }
2099 <            else if (active) {       // decrement active count without queuing
2099 >            else if (active) {      // decrement active count without queuing
2100                  long nc = ((c = ctl) & ~AC_MASK) | ((c & AC_MASK) - AC_UNIT);
2101                  if ((int)(nc >> AC_SHIFT) + parallelism == 0)
2102                      break;          // bypass decrement-then-increment
# Line 2495 | Line 2495 | public class ForkJoinPool extends Abstra
2495       * minimally only the latter.
2496       *
2497       * @param task the task
2498 +     * @param <T> the type of the task's result
2499       * @return the task's result
2500       * @throws NullPointerException if the task is null
2501       * @throws RejectedExecutionException if the task cannot be
# Line 2543 | Line 2544 | public class ForkJoinPool extends Abstra
2544       * Submits a ForkJoinTask for execution.
2545       *
2546       * @param task the task to submit
2547 +     * @param <T> the type of the task's result
2548       * @return the task
2549       * @throws NullPointerException if the task is null
2550       * @throws RejectedExecutionException if the task cannot be

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines