() = {}

4 files changed, 4 insertions, 4 deletions

diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index 1fa7e31de14..aa36e09c995 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -114,7 +114,7 @@ case $1 in
         # TODO Better way of extracting heap size arguments.
         heap_min=32
         heap_max=128
-        jvmopts="-Xms$(heap_min)M -Xmx$(heap_max)M -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:-OmitStackTraceInFastThrow"
+        jvmopts="-Xms${heap_min}M -Xmx${heap_max}M -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:-OmitStackTraceInFastThrow"
 
         VESPA_SERVICE_NAME=configproxy
         export VESPA_SERVICE_NAME
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 3f02ff1cc27..cf0ebfbbe40 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -168,7 +168,7 @@ heap_min=128
 heap_max=2048
 vespa-run-as-vespa-user vespa-runserver -s ${VESPA_SERVICE_NAME} -r 30 -p $pidfile -- \
 	java \
-	-Xms$(heap_min)m -Xmx$(heap_max)m \
+	-Xms${heap_min}m -Xmx${heap_max}m \
         $(get_jvm_hugepage_settings $heap_max) \
 	-XX:+PreserveFramePointer \
 	-XX:+HeapDumpOnOutOfMemoryError \
diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh
index e478e457470..72b31280106 100755
--- a/logserver/bin/logserver-start.sh
+++ b/logserver/bin/logserver-start.sh
@@ -80,7 +80,7 @@ cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
 
 heap_min=32
 heap_max=256
-addopts="-server -Xms$(heap_min)m -Xmx$(heap_max)m -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2 -XX:-OmitStackTraceInFastThrow -Djava.io.tmpdir=${VESPA_HOME}/tmp"
+addopts="-server -Xms${heap_min}m -Xmx${heap_max}m -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2 -XX:-OmitStackTraceInFastThrow -Djava.io.tmpdir=${VESPA_HOME}/tmp"
 
 oomopt="-XX:+ExitOnOutOfMemoryError"
 
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index 3542ad3e540..cb5d7e3d060 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -173,7 +173,7 @@ StartCommand() {
     heap_min=128
     heap_max=2048
     java \
-        -Xms$(heap_min)m -Xmx$(heap_max)m \
+        -Xms${heap_min}m -Xmx${heap_max}m \
         -XX:+PreserveFramePointer \
         $(get_jvm_hugepage_settings $heap_max) \
         -XX:+HeapDumpOnOutOfMemoryError \