--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2018/01/23 20:44:11	1.63
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2019/08/13 23:05:18	1.68
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject;
 
@@ -228,8 +227,8 @@ public class AbstractQueuedSynchronizerT
             assertTrue(c.await(timeoutMillis, MILLISECONDS));
             break;
         case awaitNanos:
-            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
-            long nanosRemaining = c.awaitNanos(nanosTimeout);
+            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
+            long nanosRemaining = c.awaitNanos(timeoutNanos);
             assertTrue(nanosRemaining > 0);
             break;
         case awaitUntil:
@@ -256,8 +255,8 @@ public class AbstractQueuedSynchronizerT
                 break;
             case awaitNanos:
                 startTime = System.nanoTime();
-                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
-                long nanosRemaining = c.awaitNanos(nanosTimeout);
+                long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
+                long nanosRemaining = c.awaitNanos(timeoutNanos);
                 assertTrue(nanosRemaining <= 0);
                 assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
                 assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
@@ -1283,7 +1282,7 @@ public class AbstractQueuedSynchronizerT
             try {
                 s.acquireInterruptibly(1);
                 shouldThrow();
-            } catch (InterruptedException expected) {}
+            } catch (InterruptedException success) {}
         };
         for (int i = 0; i < 2; i++) {
             Thread thread = new Thread(failedAcquire);
@@ -1316,7 +1315,7 @@ public class AbstractQueuedSynchronizerT
 
         // A synchronizer only offering a choice of failure modes
         class Sync extends AbstractQueuedSynchronizer {
-            boolean pleaseThrow;
+            volatile boolean pleaseThrow;
             @Override protected boolean tryAcquire(int ignored) {
                 if (pleaseThrow) throw ex;
                 return false;
@@ -1338,7 +1337,7 @@ public class AbstractQueuedSynchronizerT
         final Thread thread = newStartedThread(new CheckedRunnable() {
             public void realRun() {
                 try {
-                    if (ThreadLocalRandom.current().nextBoolean())
+                    if (randomBoolean())
                         s.acquire(1);
                     else
                         s.acquireShared(1);