--- jsr166/src/test/tck/ThreadLocalRandomTest.java	2018/01/07 22:59:18	1.28
+++ jsr166/src/test/tck/ThreadLocalRandomTest.java	2020/08/12 17:39:43	1.30
@@ -63,8 +63,7 @@ public class ThreadLocalRandomTest exten
         ThreadLocalRandom rnd = ThreadLocalRandom.current();
         final java.lang.reflect.Method m;
         try {
-            m = ThreadLocalRandom.class.getDeclaredMethod(
-                    "next", new Class[] { int.class });
+            m = ThreadLocalRandom.class.getDeclaredMethod("next", int.class);
             m.setAccessible(true);
         } catch (SecurityException acceptable) {
             // Security manager may deny access
@@ -358,27 +357,24 @@ public class ThreadLocalRandomTest exten
             new AtomicReference<>();
         final AtomicLong rand = new AtomicLong();
 
-        long firstRand = 0;
-        ThreadLocalRandom firstThreadLocalRandom = null;
-
         Runnable getRandomState = new CheckedRunnable() {
             public void realRun() {
                 ThreadLocalRandom current = ThreadLocalRandom.current();
                 assertSame(current, ThreadLocalRandom.current());
-                // test bug: the following is not guaranteed and not true in JDK8
-                //                assertNotSame(current, threadLocalRandom.get());
                 rand.set(current.nextLong());
                 threadLocalRandom.set(current);
             }};
 
-        Thread first = newStartedThread(getRandomState);
-        awaitTermination(first);
-        firstRand = rand.get();
-        firstThreadLocalRandom = threadLocalRandom.get();
+        awaitTermination(newStartedThread(getRandomState));
+        long firstRand = rand.get();
+        ThreadLocalRandom firstThreadLocalRandom = threadLocalRandom.get();
+        assertNotNull(firstThreadLocalRandom);
 
         for (int i = 0; i < NCALLS; i++) {
-            Thread t = newStartedThread(getRandomState);
-            awaitTermination(t);
+            awaitTermination(newStartedThread(getRandomState));
+            if (testImplementationDetails)
+                // ThreadLocalRandom has been a singleton since jdk8.
+                assertSame(firstThreadLocalRandom, threadLocalRandom.get());
             if (firstRand != rand.get())
                 return;
         }