Author: markt
Date: Mon Jan 13 15:42:53 2014
New Revision: 1557753
URL: http://svn.apache.org/r1557753
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55986
When forcing Tomcat to stop via "kill -9 $CATALINA_PID", the
<code>catalina.sh</code> script could incorrectly report that Tomcat had not
yet completely stopped when it had.
Based on a patch by jess.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1557752
Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1557753&r1=1557752&r2=1557753&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.sh Mon Jan 13 15:42:53 2014
@@ -500,11 +500,12 @@ elif [ "$1" = "stop" ] ; then
if [ -w "$CATALINA_PID" ]; then
cat /dev/null > "$CATALINA_PID"
else
- echo "Tomcat was killed but the PID file could not be
removed."
+ echo "The PID file could not be removed."
fi
- # Set this to zero else a warning will be issued about the
process still running
- KILL_SLEEP_INTERVAL=0
fi
+ # Set this to zero else a warning will be issued about the
process still running
+ KILL_SLEEP_INTERVAL=0
+ echo "The Tomcat process has been killed."
break
fi
if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1557753&r1=1557752&r2=1557753&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 13 15:42:53 2014
@@ -133,6 +133,12 @@
is disabled and a PID file is defined. This is only available on
platforms that use <code>catalina.sh</code>. (markt)
</fix>
+ <fix>
+ <bug>55986</bug>: When forcing Tomcat to stop via
+ <code>kill -9 $CATALINA_PID</code>, the <code>catalina.sh</code> script
+ could incorrectly report that Tomcat had not yet completely stopped
when
+ it had. Based on a patch by jess. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
