commit c6c3b1ad084aa8d6eb5bf45cc18b022ca60b9278
author Eric Barboni <skygo@apache.org> Mon Jun 28 11:07:52 2021 +0200
committer GitHub <noreply@github.com> Mon Jun 28 11:07:52 2021 +0200
tree 5bf765a7df7837be9e24c9b9590c4414dfa2adcb
parent 7234cacd23c30853cb14ae36bb495a701922e303
parent 3fea281473744df0b3f8cad0570155c9c845dac9

Merge pull request #2 from jlahoda/security-manager-allow

Include -Djava.security.manager=allow in Windows launchers.

src/main/cpp/bootstrap/platformlauncher.cpp

diff --git a/src/main/cpp/bootstrap/platformlauncher.cpp b/src/main/cpp/bootstrap/platformlauncher.cpp
index 8df954c..76fc6fc 100644
--- a/src/main/cpp/bootstrap/platformlauncher.cpp
+++ b/src/main/cpp/bootstrap/platformlauncher.cpp
@@ -52,6 +52,7 @@
 const char *PlatformLauncher::OPT_DEFAULT_USERDIR_ROOT = "-Dnetbeans.default_userdir_root=";
 const char *PlatformLauncher::OPT_HEAP_DUMP = "-XX:+HeapDumpOnOutOfMemoryError";
 const char *PlatformLauncher::OPT_HEAP_DUMP_PATH = "-XX:HeapDumpPath=";
+const char *PlatformLauncher::OPT_JAVA_SECURITY_MANAGER_ALLOW = "-Djava.security.manager=allow";
 const char *PlatformLauncher::OPT_KEEP_WORKING_SET_ON_MINIMIZE = "-Dsun.awt.keepWorkingSetOnMinimize=true";
 const char *PlatformLauncher::OPT_CLASS_PATH = "-Djava.class.path=";
 const char *PlatformLauncher::OPT_SPLASH = "-splash:";
@@ -568,6 +569,9 @@
     
     option = OPT_KEEP_WORKING_SET_ON_MINIMIZE;
     javaOptions.push_back(option);
+
+    option = OPT_JAVA_SECURITY_MANAGER_ALLOW;
+    javaOptions.push_back(option);
 }
 
 string & PlatformLauncher::constructClassPath(bool runUpdater) {

src/main/cpp/bootstrap/platformlauncher.h

diff --git a/src/main/cpp/bootstrap/platformlauncher.h b/src/main/cpp/bootstrap/platformlauncher.h
index 07fe4d8..ac3e7be 100644
--- a/src/main/cpp/bootstrap/platformlauncher.h
+++ b/src/main/cpp/bootstrap/platformlauncher.h
@@ -42,6 +42,7 @@
     static const char *OPT_DEFAULT_USERDIR_ROOT;
     static const char *OPT_HEAP_DUMP;
     static const char *OPT_HEAP_DUMP_PATH;
+    static const char *OPT_JAVA_SECURITY_MANAGER_ALLOW;
     static const char *OPT_KEEP_WORKING_SET_ON_MINIMIZE;
     static const char *OPT_CLASS_PATH;
     static const char *OPT_SPLASH;