--- jsr166/src/test/tck/ForkJoinTask8Test.java	2015/10/11 13:30:30	1.23
+++ jsr166/src/test/tck/ForkJoinTask8Test.java	2016/08/10 01:28:14	1.26
@@ -250,7 +250,7 @@ public class ForkJoinTask8Test extends J
             }
             return false;
         }
-        
+
         public final void complete() {
             BinaryAsyncAction a = this;
             for (;;) {
@@ -310,15 +310,12 @@ 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();
             }
@@ -351,15 +348,12 @@ public class ForkJoinTask8Test extends J
             try {
                 FailingAsyncFib f = this;
                 int n = f.number;
-                if (n > 1) {
-                    while (n > 1) {
-                        FailingAsyncFib p = f;
-                        FailingAsyncFib r = new FailingAsyncFib(n - 2);
-                        f = new FailingAsyncFib(--n);
-                        p.linkSubtasks(r, f);
-                        r.fork();
-                    }
-                    f.number = n;
+                while (n > 1) {
+                    FailingAsyncFib p = f;
+                    FailingAsyncFib r = new FailingAsyncFib(n - 2);
+                    f = new FailingAsyncFib(--n);
+                    p.linkSubtasks(r, f);
+                    r.fork();
                 }
                 f.complete();
             }
@@ -927,7 +921,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();
@@ -954,7 +948,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();
@@ -981,7 +975,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();