--- jsr166/src/test/tck/ForkJoinTask8Test.java	2015/10/05 22:59:29	1.19
+++ jsr166/src/test/tck/ForkJoinTask8Test.java	2017/03/18 20:42:20	1.28
@@ -8,7 +8,6 @@ import static java.util.concurrent.TimeU
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
@@ -101,7 +100,8 @@ public class ForkJoinTask8Test extends J
         assertNull(a.getException());
         assertNull(a.getRawResult());
         if (a instanceof BinaryAsyncAction)
-            assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == INITIAL_STATE);
+            assertEquals(INITIAL_STATE,
+                         ((BinaryAsyncAction)a).getForkJoinTaskTag());
 
         try {
             a.get(0L, SECONDS);
@@ -122,21 +122,22 @@ public class ForkJoinTask8Test extends J
         assertNull(a.getException());
         assertSame(expected, a.getRawResult());
         if (a instanceof BinaryAsyncAction)
-            assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == COMPLETE_STATE);
+            assertEquals(COMPLETE_STATE,
+                         ((BinaryAsyncAction)a).getForkJoinTaskTag());
 
         {
             Thread.currentThread().interrupt();
-            long t0 = System.nanoTime();
+            long startTime = System.nanoTime();
             assertSame(expected, a.join());
-            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
+            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
             Thread.interrupted();
         }
 
         {
             Thread.currentThread().interrupt();
-            long t0 = System.nanoTime();
+            long startTime = System.nanoTime();
             a.quietlyJoin();        // should be no-op
-            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
+            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
             Thread.interrupted();
         }
 
@@ -172,9 +173,9 @@ public class ForkJoinTask8Test extends J
         Thread.interrupted();
 
         {
-            long t0 = System.nanoTime();
+            long startTime = System.nanoTime();
             a.quietlyJoin();        // should be no-op
-            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
+            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
         }
 
         try {
@@ -243,6 +244,14 @@ public class ForkJoinTask8Test extends J
             super.completeExceptionally(ex);
         }
 
+        public boolean cancel(boolean mayInterruptIfRunning) {
+            if (super.cancel(mayInterruptIfRunning)) {
+                completeExceptionally(new FJException());
+                return true;
+            }
+            return false;
+        }
+
         public final void complete() {
             BinaryAsyncAction a = this;
             for (;;) {
@@ -265,13 +274,12 @@ public class ForkJoinTask8Test extends J
         }
 
         public final void completeExceptionally(Throwable ex) {
-            BinaryAsyncAction a = this;
-            while (!a.isCompletedAbnormally()) {
+            for (BinaryAsyncAction a = this;;) {
                 a.completeThisExceptionally(ex);
                 BinaryAsyncAction s = a.sibling;
-                if (s != null)
-                    s.cancel(false);
-                if (!a.onException() || (a = a.parent) == null)
+                if (s != null && !s.isDone())
+                    s.completeExceptionally(ex);
+                if ((a = a.parent) == null)
                     break;
             }
         }
@@ -303,21 +311,20 @@ public class ForkJoinTask8Test extends J
             try {
                 AsyncFib f = this;
                 int n = f.number;
-                if (n > 1) {
-                    while (n > 1) {
-                        AsyncFib p = f;
-                        AsyncFib r = new AsyncFib(n - 2);
-                        f = new AsyncFib(--n);
-                        p.linkSubtasks(r, f);
-                        r.fork();
-                    }
-                    f.number = n;
+                while (n > 1) {
+                    AsyncFib p = f;
+                    AsyncFib r = new AsyncFib(n - 2);
+                    f = new AsyncFib(--n);
+                    p.linkSubtasks(r, f);
+                    r.fork();
                 }
                 f.complete();
             }
             catch (Throwable ex) {
                 compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE);
             }
+            if (getForkJoinTaskTag() == EXCEPTION_STATE)
+                throw new FJException();
             return false;
         }
 
@@ -339,9 +346,9 @@ public class ForkJoinTask8Test extends J
         }
 
         public final boolean exec() {
-            FailingAsyncFib f = this;
-            int n = f.number;
-            if (n > 1) {
+            try {
+                FailingAsyncFib f = this;
+                int n = f.number;
                 while (n > 1) {
                     FailingAsyncFib p = f;
                     FailingAsyncFib r = new FailingAsyncFib(n - 2);
@@ -349,9 +356,13 @@ public class ForkJoinTask8Test extends J
                     p.linkSubtasks(r, f);
                     r.fork();
                 }
-                f.number = n;
+                f.complete();
+            }
+            catch (Throwable ex) {
+                compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE);
             }
-            f.complete();
+            if (getForkJoinTaskTag() == EXCEPTION_STATE)
+                throw new FJException();
             return false;
         }
 
@@ -911,7 +922,7 @@ public class ForkJoinTask8Test extends J
                 AsyncFib f = new AsyncFib(8);
                 FailingAsyncFib g = new FailingAsyncFib(9);
                 ForkJoinTask[] tasks = { f, g };
-                Collections.shuffle(Arrays.asList(tasks));
+                shuffle(tasks);
                 try {
                     invokeAll(tasks[0], tasks[1]);
                     shouldThrow();
@@ -938,7 +949,7 @@ public class ForkJoinTask8Test extends J
                 FailingAsyncFib g = new FailingAsyncFib(9);
                 AsyncFib h = new AsyncFib(7);
                 ForkJoinTask[] tasks = { f, g, h };
-                Collections.shuffle(Arrays.asList(tasks));
+                shuffle(tasks);
                 try {
                     invokeAll(tasks[0], tasks[1], tasks[2]);
                     shouldThrow();
@@ -965,7 +976,7 @@ public class ForkJoinTask8Test extends J
                 AsyncFib g = new AsyncFib(9);
                 AsyncFib h = new AsyncFib(7);
                 ForkJoinTask[] tasks = { f, g, h };
-                Collections.shuffle(Arrays.asList(tasks));
+                shuffle(tasks);
                 try {
                     invokeAll(Arrays.asList(tasks));
                     shouldThrow();
@@ -1163,7 +1174,7 @@ public class ForkJoinTask8Test extends J
         final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done));
         final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done));
         final ForkJoinPool p = singletonPool();
-        try (PoolCleaner cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             Thread external = new Thread(new CheckedRunnable() {
                 public void realRun() {
                     p.execute(a);
@@ -1185,7 +1196,6 @@ public class ForkJoinTask8Test extends J
                     assertFalse(r.isDone());
                 }};
             p.invoke(s);
-            done.countDown();
         }
     }