--- jsr166/src/test/tck/Collection8Test.java	2016/11/13 02:10:10	1.22
+++ jsr166/src/test/tck/Collection8Test.java	2016/11/15 00:08:25	1.25
@@ -61,12 +61,23 @@ public class Collection8Test extends JSR
     }
 
     /** Checks properties of empty collections. */
-    public void testEmptyMeansEmpty() throws InterruptedException {
+    public void testEmptyMeansEmpty() throws Throwable {
         Collection c = impl.emptyCollection();
         emptyMeansEmpty(c);
 
-        if (c instanceof java.io.Serializable)
-            emptyMeansEmpty(serialClone(c));
+        if (c instanceof java.io.Serializable) {
+            try {
+                emptyMeansEmpty(serialClonePossiblyFailing(c));
+            } catch (java.io.NotSerializableException ex) {
+                // excusable when we have a serializable wrapper around
+                // a non-serializable collection, as can happen with:
+                // Vector.subList() => wrapped AbstractList$RandomAccessSubList
+                if (testImplementationDetails
+                    && (! c.getClass().getName().matches(
+                                "java.util.Collections.*")))
+                    throw ex;
+            }
+        }
 
         Collection clone = cloneableClone(c);
         if (clone != null)
@@ -314,7 +325,9 @@ public class Collection8Test extends JSR
             }
         } catch (Throwable ex) {
             System.err.println(impl.klazz());
-            System.err.printf("c=%s%n", c);
+            // c is at risk of corruption if we got here, so be lenient
+            try { System.err.printf("c=%s%n", c); }
+            catch (Throwable t) { t.printStackTrace(); }
             System.err.printf("n=%d%n", n);
             System.err.printf("orig=%s%n", orig);
             System.err.printf("accepts=%s%n", accepts);
@@ -387,7 +400,7 @@ public class Collection8Test extends JSR
     public void testRemoveAfterForEachRemaining() {
         Collection c = impl.emptyCollection();
         ThreadLocalRandom rnd = ThreadLocalRandom.current();
-        {
+        testCollection: {
             int n = 3 + rnd.nextInt(2);
             for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
             Iterator it = c.iterator();
@@ -400,7 +413,10 @@ public class Collection8Test extends JSR
                 if (c instanceof java.util.concurrent.ArrayBlockingQueue) {
                     assertIteratorExhausted(it);
                 } else {
-                    it.remove();
+                    try { it.remove(); }
+                    catch (UnsupportedOperationException ok) {
+                        break testCollection;
+                    }
                     assertEquals(n - 1, c.size());
                     for (int i = 0; i < n - 1; i++)
                         assertTrue(c.contains(impl.makeElement(i)));