Skip to content

Commit

Permalink
Remove java.security.manager=allow flag from windows launcher.
Browse files Browse the repository at this point in the history
this commit implements SM removal step 1 of 3

 1) remove SM flag from win launcher and release new launcher bits
 2) move flag to config and switch to new launcher bits
 3) implement SM removal for JDK 24 compatibility
  • Loading branch information
mbien committed Dec 16, 2024
1 parent 2c6a826 commit c2e486b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
3 changes: 0 additions & 3 deletions platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ 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:";
Expand Down Expand Up @@ -579,8 +578,6 @@ 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) {
Expand Down
1 change: 0 additions & 1 deletion platform/o.n.bootstrap/launcher/windows/platformlauncher.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ 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;
Expand Down

0 comments on commit c2e486b

Please sign in to comment.