You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2021/06/28 09:08:43 UTC
[netbeans-native-launchers] branch master updated: Include
-Djava.security.manager=allow in Windows launchers.
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-native-launchers.git
The following commit(s) were added to refs/heads/master by this push:
new 3fea281 Include -Djava.security.manager=allow in Windows launchers.
new c6c3b1a Merge pull request #2 from jlahoda/security-manager-allow
3fea281 is described below
commit 3fea281473744df0b3f8cad0570155c9c845dac9
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sat Jun 26 06:53:55 2021 +0200
Include -Djava.security.manager=allow in Windows launchers.
---
src/main/cpp/bootstrap/platformlauncher.cpp | 4 ++++
src/main/cpp/bootstrap/platformlauncher.h | 1 +
2 files changed, 5 insertions(+)
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_NB_USERDIR = "-Dnetbeans.user=";
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 @@ void PlatformLauncher::prepareOptions() {
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 @@ class PlatformLauncher {
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists