--- jsr166/src/test/tck/JSR166TestCase.java	2015/01/17 23:14:17	1.127
+++ 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;
         }
     }
 
@@ -652,7 +649,7 @@ public class JSR166TestCase extends Test
                      " did not terminate in a timely manner");
         } catch (SecurityException ok) {
             // Allowed in case test doesn't have privs
-        } catch (InterruptedException ie) {
+        } catch (InterruptedException fail) {
             fail("Unexpected InterruptedException");
         }
     }
@@ -683,7 +680,7 @@ public class JSR166TestCase extends Test
             // No need to optimize the failing case via Thread.join.
             delay(millis);
             assertTrue(thread.isAlive());
-        } catch (InterruptedException ie) {
+        } catch (InterruptedException fail) {
             fail("Unexpected InterruptedException");
         }
     }
@@ -705,7 +702,7 @@ public class JSR166TestCase extends Test
             delay(millis);
             for (Thread thread : threads)
                 assertTrue(thread.isAlive());
-        } catch (InterruptedException ie) {
+        } catch (InterruptedException fail) {
             fail("Unexpected InterruptedException");
         }
     }
@@ -727,8 +724,8 @@ public class JSR166TestCase extends Test
             future.get(timeoutMillis, MILLISECONDS);
             shouldThrow();
         } catch (TimeoutException success) {
-        } catch (Exception e) {
-            threadUnexpectedException(e);
+        } catch (Exception fail) {
+            threadUnexpectedException(fail);
         } finally { future.cancel(true); }
         assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
     }
@@ -884,10 +881,10 @@ public class JSR166TestCase extends Test
     void sleep(long millis) {
         try {
             delay(millis);
-        } catch (InterruptedException ie) {
+        } catch (InterruptedException fail) {
             AssertionFailedError afe =
                 new AssertionFailedError("Unexpected InterruptedException");
-            afe.initCause(ie);
+            afe.initCause(fail);
             throw afe;
         }
     }
@@ -979,8 +976,8 @@ public class JSR166TestCase extends Test
     void awaitTermination(Thread t, long timeoutMillis) {
         try {
             t.join(timeoutMillis);
-        } catch (InterruptedException ie) {
-            threadUnexpectedException(ie);
+        } catch (InterruptedException fail) {
+            threadUnexpectedException(fail);
         } finally {
             if (t.getState() != Thread.State.TERMINATED) {
                 t.interrupt();
@@ -1006,8 +1003,8 @@ public class JSR166TestCase extends Test
         public final void run() {
             try {
                 realRun();
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
             }
         }
     }
@@ -1061,8 +1058,8 @@ public class JSR166TestCase extends Test
                 threadShouldThrow("InterruptedException");
             } catch (InterruptedException success) {
                 threadAssertFalse(Thread.interrupted());
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
             }
         }
     }
@@ -1073,8 +1070,8 @@ public class JSR166TestCase extends Test
         public final T call() {
             try {
                 return realCall();
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
                 return null;
             }
         }
@@ -1091,8 +1088,8 @@ public class JSR166TestCase extends Test
                 return result;
             } catch (InterruptedException success) {
                 threadAssertFalse(Thread.interrupted());
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
             }
             return null;
         }
@@ -1132,16 +1129,16 @@ public class JSR166TestCase extends Test
     public void await(CountDownLatch latch) {
         try {
             assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
         }
     }
 
     public void await(Semaphore semaphore) {
         try {
             assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
         }
     }
 
@@ -1335,8 +1332,8 @@ public class JSR166TestCase extends Test
         @Override protected final void compute() {
             try {
                 realCompute();
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
             }
         }
     }
@@ -1350,8 +1347,8 @@ public class JSR166TestCase extends Test
         @Override protected final T compute() {
             try {
                 return realCompute();
-            } catch (Throwable t) {
-                threadUnexpectedException(t);
+            } catch (Throwable fail) {
+                threadUnexpectedException(fail);
                 return null;
             }
         }
@@ -1375,12 +1372,12 @@ public class JSR166TestCase extends Test
         public int await() {
             try {
                 return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
-            } catch (TimeoutException e) {
+            } catch (TimeoutException timedOut) {
                 throw new AssertionFailedError("timed out");
-            } catch (Exception e) {
+            } catch (Exception fail) {
                 AssertionFailedError afe =
-                    new AssertionFailedError("Unexpected exception: " + e);
-                afe.initCause(e);
+                    new AssertionFailedError("Unexpected exception: " + fail);
+                afe.initCause(fail);
                 throw afe;
             }
         }
@@ -1408,9 +1405,7 @@ public class JSR166TestCase extends Test
                 q.remove();
                 shouldThrow();
             } catch (NoSuchElementException success) {}
-        } catch (InterruptedException ie) {
-            threadUnexpectedException(ie);
-        }
+        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
     }
 
     void assertSerialEquals(Object x, Object y) {
@@ -1429,8 +1424,8 @@ public class JSR166TestCase extends Test
             oos.flush();
             oos.close();
             return bos.toByteArray();
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
             return new byte[0];
         }
     }
@@ -1443,8 +1438,8 @@ public class JSR166TestCase extends Test
             T clone = (T) ois.readObject();
             assertSame(o.getClass(), clone.getClass());
             return clone;
-        } catch (Throwable t) {
-            threadUnexpectedException(t);
+        } catch (Throwable fail) {
+            threadUnexpectedException(fail);
             return null;
         }
     }