--- jsr166/src/test/tck/CompletableFutureTest.java	2016/09/21 18:25:04	1.177
+++ jsr166/src/test/tck/CompletableFutureTest.java	2016/09/22 22:05:49	1.179
@@ -4078,7 +4078,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletionStage minimal = f.minimalCompletionStage();
         CompletableFuture<Integer> g = minimal.toCompletableFuture();
-        g.complete(v1);
+        assertTrue(g.complete(v1));
         checkCompletedNormally(g, v1);
         checkIncomplete(f);
         checkIncomplete(minimal.toCompletableFuture());
@@ -4442,6 +4442,22 @@ public class CompletableFutureTest exten
             assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
     }
 
+    /**
+     * Checks for garbage retention when MinimalStage.toCompletableFuture()
+     * is invoked many times.
+     * 8161600: Garbage retention when source CompletableFutures are never completed
+     *
+     * As of 2016-07, fails with OOME:
+     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
+     */
+    public void testToCompletableFutureGarbageRetention() throws Throwable {
+        final int n = expensiveTests ? 900_000 : 10;
+        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
+        CompletionStage minimal = neverCompleted.minimalCompletionStage();
+        for (int i = 0; i < n; i++)
+            assertTrue(minimal.toCompletableFuture().cancel(true));
+    }
+
 //     static <U> U join(CompletionStage<U> stage) {
 //         CompletableFuture<U> f = new CompletableFuture<>();
 //         stage.whenComplete((v, ex) -> {