--- jsr166/src/test/tck/JSR166TestCase.java	2019/09/05 21:26:24	1.262
+++ jsr166/src/test/tck/JSR166TestCase.java	2019/09/07 14:28:47	1.264
@@ -1108,9 +1108,9 @@ public class JSR166TestCase extends Test
                 && (lockName = info.getLockName()) != null
                 && lockName.startsWith("java.lang.ref.Reference$Lock"))
                 continue;
-            if ("Finalizer".equals(name)
+            if (("Finalizer".equals(name) || "Common-Cleaner".equals(name))
                 && (lockName = info.getLockName()) != null
-                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
+                && lockName.startsWith("java.lang.ref"))
                 continue;
             if ("checkForWedgedTest".equals(name))
                 continue;
@@ -1410,19 +1410,6 @@ public class JSR166TestCase extends Test
         return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
     }
 
-//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
-//         long startTime = System.nanoTime();
-//         try {
-//             r.run();
-//         } catch (Throwable fail) { threadUnexpectedException(fail); }
-//         if (millisElapsedSince(startTime) > timeoutMillis/2)
-//             throw new AssertionError("did not return promptly");
-//     }
-
-//     void assertTerminatesPromptly(Runnable r) {
-//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
-//     }
-
     /**
      * Checks that timed f.get() returns the expected value, and does not
      * wait for the timeout to elapse before returning.