--- jsr166/src/jsr166y/ForkJoinPool.java	2009/07/25 15:50:57	1.23
+++ jsr166/src/jsr166y/ForkJoinPool.java	2009/07/26 05:55:34	1.25
@@ -586,10 +586,8 @@ public class ForkJoinPool extends Abstra
 
     public void execute(Runnable task) {
         ForkJoinTask<?> job;
-        if (task instanceof AdaptedCallable) // avoid re-wrap
-            job = (AdaptedCallable<?>)task;
-        else if (task instanceof AdaptedRunnable)
-            job = (AdaptedRunnable<?>)task;
+        if (task instanceof ForkJoinTask) // avoid re-wrap
+            job = (ForkJoinTask<?>)task;
         else
             job = new AdaptedRunnable<Void>(task, null);
         doSubmit(job);
@@ -609,10 +607,8 @@ public class ForkJoinPool extends Abstra
 
     public ForkJoinTask<?> submit(Runnable task) {
         ForkJoinTask<?> job;
-        if (task instanceof AdaptedCallable) // avoid re-wrap
-            job = (AdaptedCallable<?>)task;
-        else if (task instanceof AdaptedRunnable)
-            job = (AdaptedRunnable<?>)task;
+        if (task instanceof ForkJoinTask) // avoid re-wrap
+            job = (ForkJoinTask<?>)task;
         else
             job = new AdaptedRunnable<Void>(task, null);
         doSubmit(job);
@@ -1919,15 +1915,15 @@ public class ForkJoinPool extends Abstra
     }
 
     private static final sun.misc.Unsafe UNSAFE = getUnsafe();
-    static final long eventCountOffset =
+    private static final long eventCountOffset =
         fieldOffset("eventCount", ForkJoinPool.class);
-    static final long workerCountsOffset =
+    private static final long workerCountsOffset =
         fieldOffset("workerCounts", ForkJoinPool.class);
-    static final long runControlOffset =
+    private static final long runControlOffset =
         fieldOffset("runControl", ForkJoinPool.class);
-    static final long syncStackOffset =
+    private static final long syncStackOffset =
         fieldOffset("syncStack",ForkJoinPool.class);
-    static final long spareStackOffset =
+    private static final long spareStackOffset =
         fieldOffset("spareStack", ForkJoinPool.class);
 
     private boolean casEventCount(long cmp, long val) {