From bf34bad1a6bf684522d3010f52e3520b744a8d39 Mon Sep 17 00:00:00 2001
From: Eric Peters <eric.peters@dotdata.com>
Date: Tue, 29 Dec 2020 11:56:22 -0800
Subject: [PATCH] Fix #5181 - add -Xss to java_options ignore

---
 src/universal/bin/sbt     | 7 +++++--
 src/universal/bin/sbt.bat | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index ca1ddf562..c5bb32333 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -154,14 +154,14 @@ addMemory () {
   local xs=("${java_args[@]}")
   java_args=()
   for i in "${xs[@]}"; do
-    if ! [[ "${i}" == *-Xmx* ]] && ! [[ "${i}" == *-Xms* ]] && ! [[ "${i}" == *-XX:MaxPermSize* ]] && ! [[ "${i}" == *-XX:MaxMetaspaceSize* ]] && ! [[ "${i}" == *-XX:ReservedCodeCacheSize* ]]; then
+    if ! [[ "${i}" == *-Xmx* ]] && ! [[ "${i}" == *-Xms* ]] && ! [[ "${i}" == *-Xss* ]] && ! [[ "${i}" == *-XX:MaxPermSize* ]] && ! [[ "${i}" == *-XX:MaxMetaspaceSize* ]] && ! [[ "${i}" == *-XX:ReservedCodeCacheSize* ]]; then
       java_args+=("${i}")
     fi
   done
   local ys=("${sbt_options[@]}")
   sbt_options=()
   for i in "${ys[@]}"; do
-    if ! [[ "${i}" == *-Xmx* ]] && ! [[ "${i}" == *-Xms* ]] && ! [[ "${i}" == *-XX:MaxPermSize* ]] && ! [[ "${i}" == *-XX:MaxMetaspaceSize* ]] && ! [[ "${i}" == *-XX:ReservedCodeCacheSize* ]]; then
+    if ! [[ "${i}" == *-Xmx* ]] && ! [[ "${i}" == *-Xms* ]] && ! [[ "${i}" == *-Xss* ]] && ! [[ "${i}" == *-XX:MaxPermSize* ]] && ! [[ "${i}" == *-XX:MaxMetaspaceSize* ]] && ! [[ "${i}" == *-XX:ReservedCodeCacheSize* ]]; then
       sbt_options+=("${i}")
     fi
   done
@@ -187,6 +187,7 @@ addDefaultMemory() {
   # The reason is the Xms/Xmx, if they don't line up, cause errors.
   if [[ "${java_args[@]}" == *-Xmx* ]] || \
      [[ "${java_args[@]}" == *-Xms* ]] || \
+     [[ "${java_args[@]}" == *-Xss* ]] || \
      [[ "${java_args[@]}" == *-XX:+UseCGroupMemoryLimitForHeap* ]] || \
      [[ "${java_args[@]}" == *-XX:MaxRAM* ]] || \
      [[ "${java_args[@]}" == *-XX:InitialRAMPercentage* ]] || \
@@ -195,6 +196,7 @@ addDefaultMemory() {
     :
   elif [[ "${JAVA_TOOL_OPTIONS}" == *-Xmx* ]] || \
        [[ "${JAVA_TOOL_OPTIONS}" == *-Xms* ]] || \
+       [[ "${JAVA_TOOL_OPTIONS}" == *-Xss* ]] || \
        [[ "${JAVA_TOOL_OPTIONS}" == *-XX:+UseCGroupMemoryLimitForHeap* ]] || \
        [[ "${JAVA_TOOL_OPTIONS}" == *-XX:MaxRAM* ]] || \
        [[ "${JAVA_TOOL_OPTIONS}" == *-XX:InitialRAMPercentage* ]] || \
@@ -203,6 +205,7 @@ addDefaultMemory() {
     :
   elif [[ "${sbt_options[@]}" == *-Xmx* ]] || \
        [[ "${sbt_options[@]}" == *-Xms* ]] || \
+       [[ "${sbt_options[@]}" == *-Xss* ]] || \
        [[ "${sbt_options[@]}" == *-XX:+UseCGroupMemoryLimitForHeap* ]] || \
        [[ "${sbt_options[@]}" == *-XX:MaxRAM* ]] || \
        [[ "${sbt_options[@]}" == *-XX:InitialRAMPercentage* ]] || \
diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat
index 7640ea3d0..ccab7ad19 100755
--- a/src/universal/bin/sbt.bat
+++ b/src/universal/bin/sbt.bat
@@ -726,7 +726,7 @@ exit /B 0
   if "!_old_java_opts!" == "" goto :done_java_opt
   for /F "tokens=1,*" %%g in ("!_old_java_opts!") do (
     set "p=%%g"
-    if not "!p:~0,4!" == "-Xmx" if not "!p:~0,4!" == "-Xms" if not "!p:~0,15!" == "-XX:MaxPermSize" if not "!p:~0,20!" == "-XX:MaxMetaspaceSize" if not "!p:~0,25!" == "-XX:ReservedCodeCacheSize" (
+    if not "!p:~0,4!" == "-Xmx" if not "!p:~0,4!" == "-Xms" if not "!p:~0,4!" == "-Xss" if not "!p:~0,15!" == "-XX:MaxPermSize" if not "!p:~0,20!" == "-XX:MaxMetaspaceSize" if not "!p:~0,25!" == "-XX:ReservedCodeCacheSize" (
       set _new_java_opts=!_new_java_opts! %%g
     )
     set "_old_java_opts=%%h"
@@ -741,7 +741,7 @@ exit /B 0
   if "!_old_sbt_opts!" == "" goto :done_sbt_opt
   for /F "tokens=1,*" %%g in ("!_old_sbt_opts!") do (
     set "p=%%g"
-    if not "!p:~0,4!" == "-Xmx" if not "!p:~0,4!" == "-Xms" if not "!p:~0,15!" == "-XX:MaxPermSize" if not "!p:~0,20!" == "-XX:MaxMetaspaceSize" if not "!p:~0,25!" == "-XX:ReservedCodeCacheSize" (
+    if not "!p:~0,4!" == "-Xmx" if not "!p:~0,4!" == "-Xms" if not "!p:~0,4!" == "-Xss" if not "!p:~0,15!" == "-XX:MaxPermSize" if not "!p:~0,20!" == "-XX:MaxMetaspaceSize" if not "!p:~0,25!" == "-XX:ReservedCodeCacheSize" (
       set _new_sbt_opts=!_new_sbt_opts! %%g
     )
     set "_old_sbt_opts=%%h"
@@ -779,18 +779,21 @@ exit /B 0
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1
+    if "!p:~0,4!" == "-Xss" set _has_memory_args=1
   )
 
   if defined JAVA_TOOL_OPTIONS for /F %%g in ("%JAVA_TOOL_OPTIONS%") do (
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1
+    if "!p:~0,4!" == "-Xss" set _has_memory_args=1
   )
 
   if defined _SBT_OPTS for /F %%g in ("!_SBT_OPTS!") do (
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1
+    if "!p:~0,4!" == "-Xss" set _has_memory_args=1
   )
 
   if not defined _has_memory_args (