--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/03 23:17:03	1.158
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/04 00:30:50	1.159
@@ -770,13 +770,17 @@ public class JSR166TestCase extends Test
     /**
      * Allows use of try-with-resources with per-test thread pools.
      */
-    class PoolCloser<T extends ExecutorService>
+    class PoolCleaner<T extends ExecutorService>
             implements AutoCloseable {
         public final T pool;
-        public PoolCloser(T pool) { this.pool = pool; }
+        public PoolCleaner(T pool) { this.pool = pool; }
         public void close() { joinPool(pool); }
     }
 
+    <T extends ExecutorService> PoolCleaner<T> cleaner(T pool) {
+        return new PoolCleaner<T>(pool);
+    }
+
     /**
      * Waits out termination of a thread pool or fails doing so.
      */
@@ -809,9 +813,9 @@ public class JSR166TestCase extends Test
      * necessarily individually slow because they must block.
      */
     void testInParallel(Action ... actions) {
-        try (PoolCloser<ExecutorService> poolCloser
-             = new PoolCloser<>(Executors.newCachedThreadPool())) {
-            ExecutorService pool = poolCloser.pool;
+        try (PoolCleaner<ExecutorService> cleaner
+             = cleaner(Executors.newCachedThreadPool())) {
+            ExecutorService pool = cleaner.pool;
             ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
             for (final Action action : actions)
                 futures.add(pool.submit(new CheckedRunnable() {