--- jsr166/src/test/tck/ForkJoinPoolTest.java	2013/05/20 16:46:23	1.50
+++ jsr166/src/test/tck/ForkJoinPoolTest.java	2014/12/31 19:05:42	1.54
@@ -4,32 +4,31 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.security.PrivilegedAction;
+import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.Future;
 import java.util.concurrent.RecursiveTask;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import java.security.AccessControlException;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class ForkJoinPoolTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -108,7 +107,7 @@ public class ForkJoinPoolTest extends JS
     static final class FibTask extends RecursiveTask<Integer> {
         final int number;
         FibTask(int n) { number = n; }
-        public Integer compute() {
+        protected Integer compute() {
             int n = number;
             if (n <= 1)
                 return n;
@@ -136,7 +135,7 @@ public class ForkJoinPoolTest extends JS
             this.locker = locker;
             this.lock = lock;
         }
-        public Integer compute() {
+        protected Integer compute() {
             int n;
             LockingFibTask f1 = null;
             LockingFibTask f2 = null;
@@ -419,11 +418,10 @@ public class ForkJoinPoolTest extends JS
         ExecutorService e = new ForkJoinPool(1);
         try {
             final AtomicBoolean done = new AtomicBoolean(false);
-            CheckedRunnable task = new CheckedRunnable() {
+            Future<?> future = e.submit(new CheckedRunnable() {
                 public void realRun() {
                     done.set(true);
-                }};
-            Future<?> future = e.submit(task);
+                }});
             assertNull(future.get());
             assertNull(future.get(0, MILLISECONDS));
             assertTrue(done.get());