diff -r 212417b74b72 -r bfaf3300b7ba rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinPool.java --- a/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinPool.java Sat Mar 19 10:46:31 2016 +0100 +++ b/rt/emul/compact/src/main/java/java/util/concurrent/ForkJoinPool.java Sat Mar 19 12:51:03 2016 +0100 @@ -48,7 +48,6 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RunnableFuture; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.LockSupport; import java.util.concurrent.locks.ReentrantLock; @@ -399,19 +398,11 @@ defaultForkJoinWorkerThreadFactory; /** - * Permission required for callers of methods that may start or - * kill threads. - */ - private static final RuntimePermission modifyThreadPermission; - - /** * If there is a security manager, makes sure caller has * permission to modify threads. */ private static void checkPermission() { - SecurityManager security = System.getSecurityManager(); - if (security != null) - security.checkPermission(modifyThreadPermission); + throw new SecurityException(); } /** @@ -1411,7 +1402,7 @@ * java.lang.RuntimePermission}{@code ("modifyThread")} */ public ForkJoinPool() { - this(Runtime.getRuntime().availableProcessors(), + this(1, defaultForkJoinWorkerThreadFactory, null, false); } @@ -2131,7 +2122,6 @@ } // Unsafe mechanics - private static final sun.misc.Unsafe UNSAFE; private static final long ctlOffset; private static final long stealCountOffset; private static final long blockedCountOffset;