--- jsr166/src/test/tck/JSR166TestCase.java	2015/02/27 22:06:24	1.128
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/04/21 05:00:23	1.130
@@ -265,10 +265,7 @@ public class JSR166TestCase extends Test
     public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
     public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
     public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
-    public static boolean atLeastJava9() {
-        // As of 2014-05, java9 still uses 52.0 class file version
-        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
-    }
+    public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
 
     /**
      * Collects all JSR166 unit tests as one suite.
@@ -564,11 +561,11 @@ public class JSR166TestCase extends Test
     public void threadAssertEquals(Object x, Object y) {
         try {
             assertEquals(x, y);
-        } catch (AssertionFailedError t) {
-            threadRecordFailure(t);
-            throw t;
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (AssertionFailedError fail) {
+            threadRecordFailure(fail);
+            throw fail;
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
         }
     }
 
@@ -580,9 +577,9 @@ public class JSR166TestCase extends Test
     public void threadAssertSame(Object x, Object y) {
         try {
             assertSame(x, y);
-        } catch (AssertionFailedError t) {
-            threadRecordFailure(t);
-            throw t;
+        } catch (AssertionFailedError fail) {
+            threadRecordFailure(fail);
+            throw fail;
         }
     }