--- jsr166/src/test/tck/JSR166TestCase.java	2019/08/14 23:06:11	1.257
+++ jsr166/src/test/tck/JSR166TestCase.java	2019/08/20 23:06:11	1.258
@@ -1455,11 +1455,12 @@ public class JSR166TestCase extends Test
             t.join(timeoutMillis);
         } catch (InterruptedException fail) {
             threadUnexpectedException(fail);
-        } finally {
-            if (t.getState() != Thread.State.TERMINATED) {
-                t.interrupt();
-                threadFail("timed out waiting for thread to terminate");
-            }
+        }
+	Thread.State state;
+	if ((state = t.getState()) != Thread.State.TERMINATED) {
+	    t.interrupt();
+	    threadFail("timed out waiting for thread to terminate; "
+		       + "state=" + state);
         }
     }