Revert "JSR-166 update"

I missed comments on framework/base change regarding "@since 9" parts
This reverts commit 5328e07d282bef36ac8b757bbee16a761415b2c4.

Change-Id: Iff71b8a17e79a0a5c1ecadc05bccadceabb83393

1 files changed, 4 insertions, 4 deletions

diff --git a/jsr166-tests/src/test/java/jsr166/RecursiveTaskTest.java b/jsr166-tests/src/test/java/jsr166/RecursiveTaskTest.java
index 2c07c2a2f8..77833703d0 100644
--- a/jsr166-tests/src/test/java/jsr166/RecursiveTaskTest.java
+++ b/jsr166-tests/src/test/java/jsr166/RecursiveTaskTest.java
@@ -28,7 +28,7 @@ public class RecursiveTaskTest extends JSR166TestCase {
     //     main(suite(), args);
     // }
     // public static Test suite() {
-    //     return new TestSuite(RecursiveTaskTest.class);
+    //     return new TestSuite(...);
     // }
 
     private static ForkJoinPool mainPool() {
@@ -46,13 +46,15 @@ public class RecursiveTaskTest extends JSR166TestCase {
     }
 
     private <T> T testInvokeOnPool(ForkJoinPool pool, RecursiveTask<T> a) {
-        try (PoolCleaner cleaner = cleaner(pool)) {
+        try {
             checkNotDone(a);
 
             T result = pool.invoke(a);
 
             checkCompletedNormally(a, result);
             return result;
+        } finally {
+            joinPool(pool);
         }
     }
 
@@ -333,8 +335,6 @@ public class RecursiveTaskTest extends JSR166TestCase {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
                 helpQuiesce();
-                while (!f.isDone()) // wait out race
-                    ;
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f, 21);
                 return NoResult;