--- jsr166/src/test/tck/RecursiveActionTest.java 2010/11/23 07:38:40 1.26 +++ jsr166/src/test/tck/RecursiveActionTest.java 2010/11/23 08:48:23 1.27 @@ -9,6 +9,7 @@ import java.util.concurrent.Cancellation import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinTask; import java.util.concurrent.ForkJoinWorkerThread; import java.util.concurrent.RecursiveAction; import java.util.concurrent.TimeUnit; @@ -60,7 +61,7 @@ public class RecursiveActionTest extends assertNull(a.getException()); assertNull(a.getRawResult()); - if (! (Thread.currentThread() instanceof ForkJoinWorkerThread)) { + if (! ForkJoinTask.inForkJoinPool()) { Thread.currentThread().interrupt(); try { a.get(); @@ -351,7 +352,7 @@ public class RecursiveActionTest extends // test join() ------------ f = fibActions[0]; - assertFalse(f.inForkJoinPool()); + assertFalse(ForkJoinTask.inForkJoinPool()); Thread.currentThread().interrupt(); assertNull(f.join()); assertTrue(Thread.interrupted());