--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/08/25 00:07:03	1.26
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/09/29 12:33:48	1.28
@@ -214,6 +214,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -228,6 +229,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll throws ISE if not enough room
      */
@@ -241,6 +243,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (IllegalStateException success) {}
     }
+
     /**
      * Queue contains all elements, in traversal order, of successful addAll
      */
@@ -465,9 +468,9 @@ public class LinkedBlockingQueueTest ext
         final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
                 try {
+                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
                     q.poll(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (InterruptedException success) {}