Changeset 13273 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-01-03T03:41:29+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15722 - make sure that JOSM ForkJoinPool instances create threads with same permissions than JOSM

This is not the case with default JDK thread factory when JOSM is run with Java Web Start, as the presence of a security manager leads to threads created without any permission

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1197 +1197 @@
 
     /**
+     * A ForkJoinWorkerThread that will always inherit caller permissions,
+     * unlike JDK's InnocuousForkJoinWorkerThread, used if a security manager exists.
+     */
+    static final class JosmForkJoinWorkerThread extends ForkJoinWorkerThread {
+        JosmForkJoinWorkerThread(ForkJoinPool pool) {
+            super(pool);
+        }
+    }
+
+    /**
      * Returns a {@link ForkJoinPool} with the parallelism given by the preference key.
      * @param pref The preference key to determine parallelism
@@ -1209 +1219 @@
             @Override
             public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-                final ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+                // Do not use JDK default thread factory !
+                // If JOSM is started with Java Web Start, a security manager is installed and the factory
+                // creates threads without any permission, forbidding them to load a class instantiating
+                // another ForkJoinPool such as MultipolygonBuilder (see bug #15722)
+                final ForkJoinWorkerThread thread = new JosmForkJoinWorkerThread(pool);
                 thread.setName(String.format(Locale.ENGLISH, nameFormat, count.getAndIncrement()));
                 thread.setPriority(threadPriority);