--- jsr166/src/test/tck/ForkJoinTask8Test.java	2015/10/06 05:56:01	1.21
+++ jsr166/src/test/tck/ForkJoinTask8Test.java	2016/08/24 22:22:39	1.27
@@ -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;
@@ -243,6 +242,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 +272,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 +309,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 +344,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 +354,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 +920,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 +947,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 +974,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();