Skip to content

Commit cfbbd67

Browse files
author
Dimka Tsurko
committed
JE-40772 [java-memory-agent] wrong behaviour if creation Java Virtual Machine fails
1 parent 4e3a6b5 commit cfbbd67

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/memoryConfig.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ then
8383
ARGS=("$(normalize $XMAXF -Xmaxf)" "${ARGS[@]}");
8484
fi
8585

86-
JAVA_VERSION=$(${JAVA_ORIG:-java} -version 2>&1 | grep version)
86+
JAVA_VERSION=$( env -i ${JAVA_ORIG:-java} -version 2>&1 | grep version)
8787
JAVA_VERSION=${JAVA_VERSION//\"/}
8888
[ $(echo $JAVA_VERSION | awk '{ print $3 }' | awk -F '[._-]' '{print $1}') -ge 9 ] && {
8989
JAVA_VERSION=$(echo $JAVA_VERSION | awk '{print $3}')
@@ -156,7 +156,7 @@ fi
156156
ARGS=("-XX:G1PeriodicGCInterval=${G1PERIODIC_GC_INTERVAL}" "${ARGS[@]}");
157157
fi
158158
if ! echo ${ARGS[@]} | grep -q "G1PeriodicGCSystemLoadThreshold"; then
159-
ARGS=("-XX:G1PeriodicGCSystemLoadThreshold=${G1PERIODIC_GC_SYS_LOAD_THRESHOLD}" "${ARGS[@]}");
159+
ARGS=("-XX:G1PeriodicGCSystemLoadThreshold=${G1PERIODIC_GC_SYS_LOAD_THRESHOLDB}" "${ARGS[@]}");
160160
fi
161161
else
162162
if ! echo ${ARGS[@]} | grep -q "\-javaagent\:[^ ]*jelastic\-gc\-agent\.jar"

0 commit comments

Comments
 (0)