--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/29 07:01:51	1.34
+++ 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);