-
Notifications
You must be signed in to change notification settings - Fork 443
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
1 changed file
with
11 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -156,8 +156,16 @@ get_mem_opts () { | |
|
||
# if we detect any of these settings in ${java_opts} we need to NOT output our settings. | ||
# The reason is the Xms/Xmx, if they don't line up, cause errors. | ||
if [[ "${java_opts}" == *-Xmx* ]] || [[ "${java_opts}" == *-Xms* ]] || [[ "${java_opts}" == *-XX:MaxPermSize* ]] || [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]]; then | ||
echo "" | ||
if [[ "${java_opts}" == *-Xmx* ]] || | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
||
[[ "${java_opts}" == *-Xms* ]] || | ||
[[ "${java_opts}" == *-XX:MaxPermSize* ]] || | ||
[[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]] || | ||
# check java arguments for settings, too | ||
[[ "${java_args[@]}" == *-Xmx* ]] || | ||
[[ "${java_args[@]}" == *-Xms* ]] || | ||
[[ "${java_args[@]}" == *-XX:MaxPermSize* ]] || | ||
[[ "${java_args[@]}" == *-XX:ReservedCodeCacheSize* ]]; | ||
then | ||
elif [[ !$no_java_version_check ]] && [[ java_version > "1.8" ]]; then | ||
echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m" | ||
else | ||
|
@@ -332,6 +340,7 @@ EOM | |
### Main script ### | ||
### ------------------------------- ### | ||
|
||
declare debug=0 | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
muuki88
Author
Contributor
|
||
declare -a residual_args | ||
declare -a java_args | ||
declare -a app_commands | ||
|
Also, we should probably just unify java_opts + java_args before this method....