--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/29 06:21:16	1.32
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/29 07:27:26	1.35
@@ -354,13 +354,16 @@ public class LinkedTransferQueueTest ext
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
                     assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
                 }
+                long t0 = System.nanoTime();
                 aboutToWait.countDown();
                 try {
                     q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
                     shouldThrow();
-                } catch (InterruptedException success) {}
+                } catch (InterruptedException success) {
+                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
+                }
             }});
 
         aboutToWait.await();
@@ -382,7 +385,7 @@ public class LinkedTransferQueueTest ext
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
                     assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
                 }
                 try {
                     q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
@@ -910,15 +913,14 @@ public class LinkedTransferQueueTest ext
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 threadStarted.countDown();
-                q.transfer(SIZE);
+                q.transfer(five);
                 checkEmpty(q);
             }});
 
         threadStarted.await();
         waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
-        assertTrue(t.isAlive());
         assertEquals(1, q.size());
-        assertEquals(SIZE, (int) q.poll());
+        assertSame(five, q.poll());
         checkEmpty(q);
         awaitTermination(t, MEDIUM_DELAY_MS);
     }
@@ -1095,7 +1097,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * tryTransfer gives up after the timeout and return false
+     * tryTransfer gives up after the timeout and returns false
      */
     public void testTryTransfer6() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();