Merge pull request #89 from patcon/feature/84-setenv-bug-v3.8+

Use proper setenv.sh format for v3.8+.
bflad · Jun 18, 2015 · 927e699 · 927e699
2 parents 3d55bb7 + 3f5f4be
commit 927e699
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/templates/default/setenv.sh.erb b/templates/default/setenv.sh.erb
@@ -89,6 +89,7 @@ JAVA_OPTS="-Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JV
 # PermGen size needs to be increased if encountering OutOfMemoryError: PermGen problems. Specifying PermGen size is
 # not valid on IBM JDKs
 STASH_MAX_PERM_SIZE="<%= node['stash']['jvm']['maximum_permgen'] %>"
+<% if Gem::Version.new(node['stash']['version']) < Gem::Version.new('3.8') -%>
 if [ -f "${PRGDIR}/permgen.sh" ]; then
     echo "Detecting JVM PermGen support..."
     . "${PRGDIR}/permgen.sh"
@@ -99,6 +100,9 @@ if [ -f "${PRGDIR}/permgen.sh" ]; then
         echo "PermGen switch is NOT supported and will NOT be set automatically."
     fi
 fi
+<% else -%>
+JAVA_OPTS="-XX:MaxPermSize=${STASH_MAX_PERM_SIZE} ${JAVA_OPTS}"
+<% end -%>
 
 export JAVA_OPTS