--- jsr166/src/jsr166y/ForkJoinTask.java	2012/12/30 02:05:53	1.97
+++ jsr166/src/jsr166y/ForkJoinTask.java	2013/01/01 15:10:39	1.98
@@ -606,7 +606,7 @@ public abstract class ForkJoinTask<V> im
                 throw (Error)ex;
             if (ex instanceof RuntimeException)
                 throw (RuntimeException)ex;
-            throw uncheckedThrowable(ex, RuntimeException.class);
+            ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
         }
     }
 
@@ -616,8 +616,9 @@ public abstract class ForkJoinTask<V> im
      * unchecked exceptions
      */
     @SuppressWarnings("unchecked") static <T extends Throwable>
-        T uncheckedThrowable(final Throwable t, final Class<T> c) {
-        return (T)t; // rely on vacuous cast
+        void uncheckedThrow(Throwable t) throws T {
+        if (t != null)
+            throw (T)t; // rely on vacuous cast
     }
 
     /**
@@ -652,7 +653,7 @@ public abstract class ForkJoinTask<V> im
         if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
             ((ForkJoinWorkerThread)t).workQueue.push(this);
         else
-            ForkJoinPool.commonPool.externalPush(this);
+            ForkJoinPool.common.externalPush(this);
         return this;
     }
 
@@ -1076,7 +1077,7 @@ public abstract class ForkJoinTask<V> im
             wt.pool.helpQuiescePool(wt.workQueue);
         }
         else
-            ForkJoinPool.externalHelpQuiescePool();
+            ForkJoinPool.quiesceCommonPool();
     }
 
     /**
@@ -1501,4 +1502,5 @@ public abstract class ForkJoinTask<V> im
             }
         }
     }
+
 }