--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java 2011/05/21 06:24:33 1.41 +++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java 2011/06/03 05:07:14 1.42 @@ -947,23 +947,23 @@ public class AbstractQueuedSynchronizerT } /** - * awaitUninterruptibly doesn't abort on interrupt + * awaitUninterruptibly is uninterruptible */ public void testAwaitUninterruptibly() { final Mutex sync = new Mutex(); final ConditionObject c = sync.newCondition(); - final BooleanLatch acquired = new BooleanLatch(); + final BooleanLatch pleaseInterrupt = new BooleanLatch(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() { sync.acquire(); - assertTrue(acquired.releaseShared(0)); + assertTrue(pleaseInterrupt.releaseShared(0)); c.awaitUninterruptibly(); assertTrue(Thread.interrupted()); assertHasWaitersLocked(sync, c, NO_THREADS); sync.release(); }}); - acquired.acquireShared(0); + pleaseInterrupt.acquireShared(0); sync.acquire(); assertHasWaitersLocked(sync, c, t); sync.release(); @@ -990,15 +990,15 @@ public class AbstractQueuedSynchronizerT public void testInterruptible(final AwaitMethod awaitMethod) { final Mutex sync = new Mutex(); final ConditionObject c = sync.newCondition(); - final BooleanLatch acquired = new BooleanLatch(); + final BooleanLatch pleaseInterrupt = new BooleanLatch(); Thread t = newStartedThread(new CheckedInterruptedRunnable() { public void realRun() throws InterruptedException { sync.acquire(); - assertTrue(acquired.releaseShared(0)); + assertTrue(pleaseInterrupt.releaseShared(0)); await(c, awaitMethod); }}); - acquired.acquireShared(0); + pleaseInterrupt.acquireShared(0); t.interrupt(); awaitTermination(t); }