Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit 927e699

Browse files
committed
Merge pull request #89 from patcon/feature/84-setenv-bug-v3.8+
Use proper setenv.sh format for v3.8+.
2 parents 3d55bb7 + 3f5f4be commit 927e699

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

templates/default/setenv.sh.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ JAVA_OPTS="-Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JV
8989
# PermGen size needs to be increased if encountering OutOfMemoryError: PermGen problems. Specifying PermGen size is
9090
# not valid on IBM JDKs
9191
STASH_MAX_PERM_SIZE="<%= node['stash']['jvm']['maximum_permgen'] %>"
92+
<% if Gem::Version.new(node['stash']['version']) < Gem::Version.new('3.8') -%>
9293
if [ -f "${PRGDIR}/permgen.sh" ]; then
9394
echo "Detecting JVM PermGen support..."
9495
. "${PRGDIR}/permgen.sh"
@@ -99,6 +100,9 @@ if [ -f "${PRGDIR}/permgen.sh" ]; then
99100
echo "PermGen switch is NOT supported and will NOT be set automatically."
100101
fi
101102
fi
103+
<% else -%>
104+
JAVA_OPTS="-XX:MaxPermSize=${STASH_MAX_PERM_SIZE} ${JAVA_OPTS}"
105+
<% end -%>
102106

103107
export JAVA_OPTS
104108

0 commit comments

Comments
 (0)