--- jsr166/src/test/tck/PriorityBlockingQueueTest.java	2018/05/06 22:29:24	1.80
+++ jsr166/src/test/tck/PriorityBlockingQueueTest.java	2018/05/28 21:19:50	1.81
@@ -573,10 +573,12 @@ public class PriorityBlockingQueueTest e
      */
     public void testToArray() throws InterruptedException {
         PriorityBlockingQueue q = populatedQueue(SIZE);
-        Object[] o = q.toArray();
-        Arrays.sort(o);
-        for (int i = 0; i < o.length; i++)
-            assertSame(o[i], q.take());
+        Object[] a = q.toArray();
+        assertSame(Object[].class, a.getClass());
+        Arrays.sort(a);
+        for (Object o : a)
+            assertSame(o, q.take());
+        assertTrue(q.isEmpty());
     }
 
     /**
@@ -588,8 +590,9 @@ public class PriorityBlockingQueueTest e
         Integer[] array = q.toArray(ints);
         assertSame(ints, array);
         Arrays.sort(ints);
-        for (int i = 0; i < ints.length; i++)
-            assertSame(ints[i], q.take());
+        for (Integer o : ints)
+            assertSame(o, q.take());
+        assertTrue(q.isEmpty());
     }
 
     /**