--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2011/05/02 00:03:34	1.46
+++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2011/05/02 00:11:34	1.50
@@ -224,8 +224,8 @@ public class ReentrantReadWriteLockTest
 
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
-        lock.writeLock().unlock();
         t.join();
+        releaseLock(lock.writeLock());
     }
 
     /**
@@ -241,9 +241,8 @@ public class ReentrantReadWriteLockTest
 
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
-        Thread.sleep(SHORT_DELAY_MS);
-        lock.writeLock().unlock();
         t.join();
+        releaseLock(lock.writeLock());
     }
 
     /**
@@ -260,6 +259,7 @@ public class ReentrantReadWriteLockTest
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
+        releaseLock(lock.writeLock());
     }
 
 
@@ -682,9 +682,8 @@ public class ReentrantReadWriteLockTest
 
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
-        Thread.sleep(SHORT_DELAY_MS);
         t.join();
-        lock.writeLock().unlock();
+        releaseLock(lock.writeLock());
     }
 
     /**