--- jsr166/src/test/tck/CompletableFutureTest.java	2013/04/01 20:06:25	1.14
+++ jsr166/src/test/tck/CompletableFutureTest.java	2013/04/03 16:59:57	1.15
@@ -355,7 +355,9 @@ public class CompletableFutureTest exten
     }
 
     static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
+        boolean ran;
         public Integer apply(Integer x, Throwable t) {
+            ran = true;
             return (t == null) ? two : three;
         }
     }
@@ -384,16 +386,33 @@ public class CompletableFutureTest exten
      * normal or exceptional completion of source
      */
     public void testHandle() {
-        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
-        IntegerHandler r = new IntegerHandler();
-        CompletableFuture<Integer> g = f.handle(r);
+        CompletableFuture<Integer> f, g;
+        IntegerHandler r;
+
+        f = new CompletableFuture<Integer>();
         f.completeExceptionally(new CFException());
+        g = f.handle(r = new IntegerHandler());
+        assertTrue(r.ran);
         checkCompletedNormally(g, three);
 
         f = new CompletableFuture<Integer>();
-        r = new IntegerHandler();
-        g = f.handle(r);
+        g = f.handle(r = new IntegerHandler());
+        assertFalse(r.ran);
+        f.completeExceptionally(new CFException());
+        checkCompletedNormally(g, three);
+        assertTrue(r.ran);
+
+        f = new CompletableFuture<Integer>();
+        f.complete(one);
+        g = f.handle(r = new IntegerHandler());
+        assertTrue(r.ran);
+        checkCompletedNormally(g, two);
+
+        f = new CompletableFuture<Integer>();
+        g = f.handle(r = new IntegerHandler());
+        assertFalse(r.ran);
         f.complete(one);
+        assertTrue(r.ran);
         checkCompletedNormally(g, two);
     }