Skip to content

Commit 17c78ca

Browse files
committed
[OPENJDK-1551] avoid passing JAVA_APP_NAME through subshell
Avoid quoting issues caused by passing JAVA_APP_NAME through subshells. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 97ce862 commit 17c78ca

File tree

1 file changed

+5
-9
lines changed
  • modules/run/artifacts/opt/jboss/container/java/run

1 file changed

+5
-9
lines changed

modules/run/artifacts/opt/jboss/container/java/run/run-java.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,6 @@ get_classpath() {
182182
echo "${cp_path}"
183183
}
184184

185-
# Set process name if possible
186-
get_exec_args() {
187-
if [ "x${JAVA_APP_NAME}" != x ]; then
188-
echo "-a '${JAVA_APP_NAME}'"
189-
fi
190-
}
191-
192185
# Start JVM
193186
startup() {
194187
# Initialize environment
@@ -201,8 +194,11 @@ startup() {
201194
else
202195
args="-jar ${JAVA_APP_JAR}"
203196
fi
204-
log_info "exec $(get_exec_args) java $(get_java_options) -cp \"$(get_classpath)\" ${args} $*"
205-
exec $(get_exec_args) java $(get_java_options) -cp "$(get_classpath)" ${args} $*
197+
198+
procname="${JAVA_APP_NAME-java}"
199+
200+
log_info "exec -a \"${procname}\" java $(get_java_options) -cp \"$(get_classpath)\" ${args} $*"
201+
exec -a "${procname}" java $(get_java_options) -cp "$(get_classpath)" ${args} $*
206202
}
207203

208204
# =============================================================================

0 commit comments

Comments
 (0)