[OPENJDK-2833] hook masked_args into get_java_options for logging

jmtd · jmtd · commit 398878dfe61c · 2024-05-02T12:08:42.000+01:00
Signed-off-by: Jonathan Dowland &lt;jdowland@redhat.com&gt;
diff --git a/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh b/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh
@@ -235,9 +235,9 @@ startup() {
 
   local procname="${JAVA_APP_NAME-java}"
 
-  local masked_args=$(mask_passwords "${args}")
+  local masked_opts=$(mask_passwords "$(get_java_options)")
 
-  log_info "exec -a \"${procname}\" java $(get_java_options) -cp \"$(get_classpath)\" ${masked_args} $*"
+  log_info "exec -a \"${procname}\" java ${masked_opts} -cp \"$(get_classpath)\" ${args} $*"
   log_info "running in $PWD"
   exec -a "${procname}" java $(get_java_options) -cp "$(get_classpath)" ${args} $*
 }

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ startup() {`
`235`	`235`
`236`	`236`	`local procname="${JAVA_APP_NAME-java}"`
`237`	`237`
`238`		`- local masked_args=$(mask_passwords "${args}")`
	`238`	`+ local masked_opts=$(mask_passwords "$(get_java_options)")`
`239`	`239`
`240`		`- log_info "exec -a \"${procname}\" java $(get_java_options) -cp \"$(get_classpath)\" ${masked_args} $*"`
	`240`	`+ log_info "exec -a \"${procname}\" java ${masked_opts} -cp \"$(get_classpath)\" ${args} $*"`
`241`	`241`	`log_info "running in $PWD"`
`242`	`242`	`exec -a "${procname}" java $(get_java_options) -cp "$(get_classpath)" ${args} $*`
`243`	`243`	`}`