1.1 --- a/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinPool.java Sat Mar 19 10:46:31 2016 +0100
1.2 +++ b/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinPool.java Sat Mar 19 12:51:03 2016 +0100
1.3 @@ -48,7 +48,6 @@
1.4 import java.util.concurrent.RejectedExecutionException;
1.5 import java.util.concurrent.RunnableFuture;
1.6 import java.util.concurrent.TimeUnit;
1.7 -import java.util.concurrent.TimeoutException;
1.8 import java.util.concurrent.atomic.AtomicInteger;
1.9 import java.util.concurrent.locks.LockSupport;
1.10 import java.util.concurrent.locks.ReentrantLock;
1.11 @@ -399,19 +398,11 @@
1.12 defaultForkJoinWorkerThreadFactory;
1.13
1.14 /**
1.15 - * Permission required for callers of methods that may start or
1.16 - * kill threads.
1.17 - */
1.18 - private static final RuntimePermission modifyThreadPermission;
1.19 -
1.20 - /**
1.21 * If there is a security manager, makes sure caller has
1.22 * permission to modify threads.
1.23 */
1.24 private static void checkPermission() {
1.25 - SecurityManager security = System.getSecurityManager();
1.26 - if (security != null)
1.27 - security.checkPermission(modifyThreadPermission);
1.28 + throw new SecurityException();
1.29 }
1.30
1.31 /**
1.32 @@ -1411,7 +1402,7 @@
1.33 * java.lang.RuntimePermission}{@code ("modifyThread")}
1.34 */
1.35 public ForkJoinPool() {
1.36 - this(Runtime.getRuntime().availableProcessors(),
1.37 + this(1,
1.38 defaultForkJoinWorkerThreadFactory, null, false);
1.39 }
1.40
1.41 @@ -2131,7 +2122,6 @@
1.42 }
1.43
1.44 // Unsafe mechanics
1.45 - private static final sun.misc.Unsafe UNSAFE;
1.46 private static final long ctlOffset;
1.47 private static final long stealCountOffset;
1.48 private static final long blockedCountOffset;