Changeset 18322 in josm

Timestamp:

2021-11-11T13:45:51+01:00 (2 years ago)

Author:

Don-vip

Message:

see #20522 see #21005 - Allow security manager, otherwise it raises a warning in Java 17 and throws an error with Java 18+

See ​https://bugs.openjdk.java.net/browse/JDK-8271301
See ​https://bugs.openjdk.java.net/browse/JDK-8270380

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (1 diff)

trunk/build.xml

@@ -458 +458 @@
                             <jvmarg value="-Dfile.encoding=UTF-8"/>
                             <jvmarg value="-Djava.locale.providers=SPI,JRE,CLDR" if:set="isJava9" />
+                            <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" />
                             <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
                             <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1035 +1035 @@
         // Disable automatic POST retry after 5 minutes, see #17882 / https://bugs.openjdk.java.net/browse/JDK-6382788
         Utils.updateSystemProperty("sun.net.http.retryPost", "false");
+        if (Utils.getJavaVersion() >= 17) {
+            // Allow security manager, otherwise it raises a warning in Java 17 and throws an error with Java 18+
+            // See https://bugs.openjdk.java.net/browse/JDK-8271301 / https://bugs.openjdk.java.net/browse/JDK-8270380
+            Utils.updateSystemProperty("java.security.manager", "allow");
+        }
     }