From 5126e6623ca797d30b9118dc3ac7c51307de863f Mon Sep 17 00:00:00 2001
From: Blaine Motsinger <blaine@renderorange.com>
Date: Sat, 26 Sep 2020 23:43:46 -0500
Subject: [PATCH] Remove invalid java invocation arguments

The UseConcMarkSweepGC, CMSIncrementalPacing, and AggressiveOpts
arguments are no longer supported in current versions of Java.
Java fails to start with them present.

Additionally, having less specific default invocation options
allows supporting more versions of Java and makes for less
maintenance into the future as options are deprecated.

Invocation options can be added to individual server configs, or
to the global config, if the user wants to change the defaults.

Fixes issue #402
---
 init/msm | 2 +-
 msm.conf | 2 +-
 test.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init/msm b/init/msm
index ba66ad1..8442218 100755
--- a/init/msm
+++ b/init/msm
@@ -3317,7 +3317,7 @@ register_settings() {
 	register_server_setting WORLDS_FLAG_INRAM "inram"
 
 	register_server_setting RAM "1024"
-	register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui"
+	register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui"
 	register_server_setting STOP_DELAY "10"
 	register_server_setting RESTART_DELAY "10"
 
diff --git a/msm.conf b/msm.conf
index a58c98b..c27b899 100644
--- a/msm.conf
+++ b/msm.conf
@@ -162,7 +162,7 @@ DEFAULT_RAM="1024"
 #
 # Hard coding values here (not using {MEMORY} and {JAR} tags) will prevent
 # servers from individually overriding those values.
-DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui"
+DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui"
 
 
 # The default time to delay between warning players the server is stopping and
diff --git a/test.sh b/test.sh
index 7ef212b..0969a5b 100755
--- a/test.sh
+++ b/test.sh
@@ -48,7 +48,7 @@ setUp() {
 	echo "DEBUG=\"true\"" >> "$MSM_CONF"
 	echo "DEFAULT_USERNAME=\"${USERNAME}\"" >> "$MSM_CONF"
 	echo "DEFAULT_SCREEN_NAME=\"msmtest-${SERVER_NAME}\"" >> "$MSM_CONF"
-	echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui\"" >> "$MSM_CONF"
+	echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -jar {JAR} nogui\"" >> "$MSM_CONF"
 
 	source $TEST_SCRIPT