--- jsr166/src/jsr166y/ForkJoinPool.java	2010/09/06 21:36:43	1.71
+++ jsr166/src/jsr166y/ForkJoinPool.java	2010/09/07 06:32:45	1.74
@@ -300,7 +300,7 @@ public class ForkJoinPool extends Abstra
      * about the same time as another is needlessly being created. We
      * counteract this and related slop in part by requiring resumed
      * spares to immediately recheck (in preStep) to see whether they
-     * they should re-suspend.
+     * should re-suspend.
      *
      * 6. Killing off unneeded workers. A timeout mechanism is used to
      * shed unused workers: The oldest (first) event queue waiter uses
@@ -429,7 +429,7 @@ public class ForkJoinPool extends Abstra
 
     /**
      * The wakeup interval (in nanoseconds) for the oldest worker
-     * worker waiting for an event invokes tryShutdownUnusedWorker to shrink
+     * waiting for an event invokes tryShutdownUnusedWorker to shrink
      * the number of workers.  The exact value does not matter too
      * much, but should be long enough to slowly release resources
      * during long periods without use without disrupting normal use.
@@ -806,7 +806,7 @@ public class ForkJoinPool extends Abstra
     // Maintaining parallelism
 
     /**
-     * Pushes worker onto the spare stack
+     * Pushes worker onto the spare stack.
      */
     final void pushSpare(ForkJoinWorkerThread w) {
         int ns = (++w.spareCount << SPARE_COUNT_SHIFT) | (w.poolIndex + 1);
@@ -1125,7 +1125,7 @@ public class ForkJoinPool extends Abstra
     }
 
     /**
-     * Clear out and cancel submissions, ignoring exceptions
+     * Clears out and cancels submissions, ignoring exceptions.
      */
     private void cancelSubmissions() {
         ForkJoinTask<?> task;
@@ -1140,15 +1140,15 @@ public class ForkJoinPool extends Abstra
     // misc support for ForkJoinWorkerThread
 
     /**
-     * Returns pool number
+     * Returns pool number.
      */
     final int getPoolNumber() {
         return poolNumber;
     }
 
     /**
-     * Tries to accumulates steal count from a worker, clearing
-     * the worker's value.
+     * Tries to accumulate steal count from a worker, clearing
+     * the worker's value if successful.
      *
      * @return true if worker steal count now zero
      */
@@ -1172,7 +1172,10 @@ public class ForkJoinPool extends Abstra
         int pc = parallelism; // use parallelism, not rc
         int ac = runState;    // no mask -- artificially boosts during shutdown
         // Use exact results for small values, saturate past 4
-        return pc <= ac? 0 : pc >>> 1 <= ac? 1 : pc >>> 2 <= ac? 3 : pc >>> 3;
+        return ((pc <= ac) ? 0 :
+                (pc >>> 1 <= ac) ? 1 :
+                (pc >>> 2 <= ac) ? 3 :
+                pc >>> 3);
     }
 
     // Public and protected methods
@@ -1222,13 +1225,13 @@ public class ForkJoinPool extends Abstra
      * use {@link #defaultForkJoinWorkerThreadFactory}.
      * @param handler the handler for internal worker threads that
      * terminate due to unrecoverable errors encountered while executing
-     * tasks. For default value, use <code>null</code>.
+     * tasks. For default value, use {@code null}.
      * @param asyncMode if true,
      * establishes local first-in-first-out scheduling mode for forked
      * tasks that are never joined. This mode may be more appropriate
      * than default locally stack-based mode in applications in which
      * worker threads only process event-style asynchronous tasks.
-     * For default value, use <code>false</code>.
+     * For default value, use {@code false}.
      * @throws IllegalArgumentException if parallelism less than or
      *         equal to zero, or greater than implementation limit
      * @throws NullPointerException if the factory is null