--- jsr166/src/test/tck/CompletableFutureTest.java	2015/10/02 21:08:48	1.126
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/10/25 02:58:25	1.127
@@ -837,9 +837,9 @@ public class CompletableFutureTest exten
         if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = f.exceptionally
             ((Throwable t) -> {
-                // Should not be called
                 a.getAndIncrement();
-                throw new AssertionError();
+                threadFail("should not be called");
+                return null;            // unreached
             });
         if (createIncomplete) assertTrue(f.complete(v1));