# HG changeset patch
# User dl
# Date 1512238398 28800
# Node ID f55cdd83e303dee54b61d269c93f2f1302c3aee5
# Parent  ff597804e8c1b0352bdabb0712c12ac03a22de26
8191069: Miscellaneous changes imported from jsr166 CVS 2017-12
Reviewed-by: martin, psandoz

diff -r ff597804e8c1 -r f55cdd83e303 test/jdk/java/util/concurrent/tck/StampedLockTest.java
--- a/test/jdk/java/util/concurrent/tck/StampedLockTest.java	Sat Dec 02 10:08:55 2017 -0800
+++ b/test/jdk/java/util/concurrent/tck/StampedLockTest.java	Sat Dec 02 10:13:18 2017 -0800
@@ -614,7 +614,7 @@
         long s = lock.readLock();
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertEquals(0L, lock.tryWriteLock());
+                assertEquals(0L, lock.tryWriteLock());
             }});
 
         awaitTermination(t);