This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new c4acd4faa9 Fix BZ 66507 - Catalina version command not honoring
JAVA_OPTS variable
c4acd4faa9 is described below
commit c4acd4faa9b297dfffecc82df0b1a4dc4479d067
Author: lihan <li...@apache.org>
AuthorDate: Tue Mar 7 11:38:51 2023 +0800
Fix BZ 66507 - Catalina version command not honoring JAVA_OPTS variable
Patch suggested by Eric Hamilton
https://bz.apache.org/bugzilla/show_bug.cgi?id=66507
---
bin/catalina.bat | 2 +-
bin/catalina.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index 824773b460..a5cf1a92f6 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -324,7 +324,7 @@ set CATALINA_OPTS=
goto execCmd
:doVersion
-%_EXECJAVA% -classpath "%CATALINA_HOME%\lib\catalina.jar"
org.apache.catalina.util.ServerInfo
+%_EXECJAVA% %JAVA_OPTS% -classpath "%CATALINA_HOME%\lib\catalina.jar"
org.apache.catalina.util.ServerInfo
goto end
diff --git a/bin/catalina.sh b/bin/catalina.sh
index a15accbdb5..32f87ffb6f 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -614,9 +614,9 @@ elif [ "$1" = "configtest" ] ; then
elif [ "$1" = "version" ] ; then
- "$_RUNJAVA" \
- -classpath "$CATALINA_HOME/lib/catalina.jar" \
- org.apache.catalina.util.ServerInfo
+ eval "\"$_RUNJAVA\"" "$JAVA_OPTS" \
+ -classpath "\"$CATALINA_HOME/lib/catalina.jar\"" \
+ org.apache.catalina.util.ServerInfo
else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
