--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/03 23:17:03	1.158
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/04 04:40:00	1.162
@@ -770,13 +770,16 @@ public class JSR166TestCase extends Test
     /**
      * Allows use of try-with-resources with per-test thread pools.
      */
-    class PoolCloser<T extends ExecutorService>
-            implements AutoCloseable {
-        public final T pool;
-        public PoolCloser(T pool) { this.pool = pool; }
+    class PoolCleaner implements AutoCloseable {
+        private final ExecutorService pool;
+        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
         public void close() { joinPool(pool); }
     }
 
+    PoolCleaner cleaner(ExecutorService pool) {
+        return new PoolCleaner(pool);
+    }
+
     /**
      * Waits out termination of a thread pool or fails doing so.
      */
@@ -809,9 +812,8 @@ 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;
+        ExecutorService pool = Executors.newCachedThreadPool();
+        try (PoolCleaner cleaner = cleaner(pool)) {
             ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
             for (final Action action : actions)
                 futures.add(pool.submit(new CheckedRunnable() {
@@ -1316,11 +1318,22 @@ public class JSR166TestCase extends Test
             }};
     }
 
-    public Runnable awaiter(final CountDownLatch latch) {
-        return new CheckedRunnable() {
-            public void realRun() throws InterruptedException {
-                await(latch);
-            }};
+    class LatchAwaiter extends CheckedRunnable {
+        static final int NEW = 0;
+        static final int RUNNING = 1;
+        static final int DONE = 2;
+        final CountDownLatch latch;
+        int state = NEW;
+        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
+        public void realRun() throws InterruptedException {
+            state = 1;
+            await(latch);
+            state = 2;
+        }
+    }
+
+    public LatchAwaiter awaiter(CountDownLatch latch) {
+        return new LatchAwaiter(latch);
     }
 
     public void await(CountDownLatch latch) {