--- jsr166/src/test/tck/ForkJoinPoolTest.java	2015/10/03 19:18:37	1.58
+++ jsr166/src/test/tck/ForkJoinPoolTest.java	2015/10/04 00:30:50	1.59
@@ -981,9 +981,9 @@ public class ForkJoinPoolTest extends JS
      * timed invokeAll(c) returns results of all completed tasks in c
      */
     public void testTimedInvokeAll5() throws Throwable {
-        try (PoolCloser<ForkJoinPool> poolCloser
-             = new PoolCloser<>(new ForkJoinPool(1))) {
-            ForkJoinPool e = poolCloser.pool;
+        try (PoolCleaner<ForkJoinPool> cleaner
+             = cleaner(new ForkJoinPool(1))) {
+            ForkJoinPool e = cleaner.pool;
             List<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(new StringTask());