Merge pull request #2 from jlahoda/security-manager-allow
Include -Djava.security.manager=allow in Windows launchers.
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) {
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;