Skip to content

Commit fe7aecf

Browse files
committed
move security manager flag from launcher to config
1 parent b390e09 commit fe7aecf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

nb/ide.launcher/netbeans.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/@@metabuild.RawVersion@@"
5656
# The automatically selected value can be overridden by specifying -J-Xmx
5757
# here or on the command line.
5858
#
59-
netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"
59+
netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Djava.security.manager=allow -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"
6060

6161
# Default location of JDK:
6262
# (set by installer or commented out if launcher should decide)

platform/o.n.bootstrap/launcher/unix/nbexec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fi
192192
# rename old heap dump to .old
193193
mv "${userdir}/var/log/heapdump.hprof" "${userdir}/var/log/heapdump.hprof.old" > /dev/null 2>&1
194194

195-
jargs_without_clusters="$jargs -Djava.security.manager=allow"
195+
jargs_without_clusters="$jargs"
196196
jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters"
197197

198198
if [ -z "$cachedirspecified" ]; then

0 commit comments

Comments
 (0)