--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 00:40:33	1.50
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 00:59:09	1.51
@@ -234,7 +234,7 @@ public class ThreadPoolExecutorSubclassT
             new CustomTPE(1, 1,
                           2 * LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(10));
-        try (PoolCleaner<ThreadPoolExecutor> cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p)) {
             final CountDownLatch done = new CountDownLatch(1);
             final Runnable task = new CheckedRunnable() {
                 public void realRun() { done.countDown(); }};
@@ -254,7 +254,7 @@ public class ThreadPoolExecutorSubclassT
                           new ArrayBlockingQueue<Runnable>(10));
         final CountDownLatch threadStarted = new CountDownLatch(1);
         final CountDownLatch done = new CountDownLatch(1);
-        try {
+        try (PoolCleaner cleaner = cleaner(p)) {
             assertEquals(0, p.getActiveCount());
             p.execute(new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
@@ -264,9 +264,7 @@ public class ThreadPoolExecutorSubclassT
                 }});
             assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
             assertEquals(1, p.getActiveCount());
-        } finally {
             done.countDown();
-            joinPool(p);
         }
     }