From: rjung Date: Sun, 22 Jul 2007 18:29:59 +0000 (+0000) Subject: BZ 42951: Port r454193 (BZ 36976) from TC 5.5.x: X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=11a8954b99a0098962dd1556e279bb95790d5e30;p=tomcat7.0 BZ 42951: Port r454193 (BZ 36976) from TC 5.5.x: Don't use CATALINA_OPTS when stopping Tomcat. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@558522 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/bin/catalina.bat b/bin/catalina.bat index 9810e5ee6..d4734766d 100644 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -12,7 +12,7 @@ rem of a Catalina installation. If not present, resolves to rem the same directory that CATALINA_HOME points to. rem rem CATALINA_OPTS (Optional) Java runtime options used when the "start", -rem "stop", or "run" command is executed. +rem or "run" command is executed. rem rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory rem the JVM should use (java.io.tmpdir). Defaults to @@ -188,6 +188,7 @@ goto execCmd :doStop shift set ACTION=stop +set CATALINA_OPTS= goto execCmd :doVersion diff --git a/bin/catalina.sh b/bin/catalina.sh index b447eb673..70afbbd3c 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -11,7 +11,7 @@ # the same directory that CATALINA_HOME points to. # # CATALINA_OPTS (Optional) Java runtime options used when the "start", -# "stop", or "run" command is executed. +# or "run" command is executed. # # CATALINA_TMPDIR (Optional) Directory path location of temporary directory # the JVM should use (java.io.tmpdir). Defaults to @@ -292,7 +292,7 @@ elif [ "$1" = "stop" ] ; then FORCE=1 fi - "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ + "$_RUNJAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 298df62ce..27bbfde91 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -10,10 +10,25 @@ Remy Maucherat Yoav Shapira Filip Hanik + Rainer Jung Changelog +
+ + + + 42951: Don't use CATALINA_OPTS when stopping Tomcat. This + allows options for starting and stopping to be set on JAVA_OPTS and + options for starting only to be set on CATALINA_OPTS. Without this + fix, some startup options (eg the port for remote JMX) would cause + stop to fail. Based on a fix suggested by Michael Vorburger. + Port of r454193 (36976) from Tomcat 5.5.x. (markt,rjung) + + + +