Skip to content

Commit 41f5cd2

Browse files
committed
Delete duplicate JAVA_ARGS value in the logs ubi8/openjdk image.
-Added behave test to runtime.feature file for this change Signed-off-by: Jayashree Huttanagoudar <[email protected]>
1 parent d5c5d16 commit 41f5cd2

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ startup() {
237237
else
238238
args="-jar ${JAVA_APP_JAR}"
239239
fi
240-
log_info "exec $(get_exec_args) java $(get_java_options) -cp \"$(get_classpath)\" ${args} $* ${JAVA_ARGS}"
240+
log_info "exec $(get_exec_args) java $(get_java_options) -cp \"$(get_classpath)\" ${args} $*"
241241
exec $(get_exec_args) java $(get_java_options) -cp "$(get_classpath)" ${args} $*
242242
}
243243

tests/features/java/runtime.feature

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,15 @@ Feature: Openshift OpenJDK Runtime tests
3535
| JAVA_DIAGNOSTICS | true |
3636
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
3737
And container log should contain -XX:NativeMemoryTracking=summary
38+
39+
@openjdk
40+
@ubi8/openjdk-8
41+
@ubi8/openjdk-11
42+
@ubi8/openjdk-17
43+
@redhat-openjdk-18
44+
@openj9
45+
Scenario: OPENJDK-474 to ensure JAVA_ARGS is not duplicated in the java command line
46+
Given container is started with env
47+
| variable | value |
48+
| JAVA_ARGS | unique |
49+
Then container log should not contain unique unique

0 commit comments

Comments
 (0)