Skip to content

Commit cc6c2a7

Browse files
committed
FIX #211 and #232. Checking $java_args[@] for memory settings, too.
1 parent 1862f04 commit cc6c2a7

File tree

1 file changed

+11
-2
lines changed
  • src/main/resources/com/typesafe/sbt/packager/archetypes

1 file changed

+11
-2
lines changed

src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template

+11-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,16 @@ get_mem_opts () {
156156

157157
# if we detect any of these settings in ${java_opts} we need to NOT output our settings.
158158
# The reason is the Xms/Xmx, if they don't line up, cause errors.
159-
if [[ "${java_opts}" == *-Xmx* ]] || [[ "${java_opts}" == *-Xms* ]] || [[ "${java_opts}" == *-XX:MaxPermSize* ]] || [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]]; then
160-
echo ""
159+
if [[ "${java_opts}" == *-Xmx* ]] ||
160+
[[ "${java_opts}" == *-Xms* ]] ||
161+
[[ "${java_opts}" == *-XX:MaxPermSize* ]] ||
162+
[[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]] ||
163+
# check java arguments for settings, too
164+
[[ "${java_args[@]}" == *-Xmx* ]] ||
165+
[[ "${java_args[@]}" == *-Xms* ]] ||
166+
[[ "${java_args[@]}" == *-XX:MaxPermSize* ]] ||
167+
[[ "${java_args[@]}" == *-XX:ReservedCodeCacheSize* ]];
168+
then
161169
elif [[ !$no_java_version_check ]] && [[ java_version > "1.8" ]]; then
162170
echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m"
163171
else
@@ -332,6 +340,7 @@ EOM
332340
### Main script ###
333341
### ------------------------------- ###
334342

343+
declare debug=0
335344
declare -a residual_args
336345
declare -a java_args
337346
declare -a app_commands

0 commit comments

Comments
 (0)