Author: markt
Date: Mon Feb 19 15:52:43 2018
New Revision: 1824766
URL: http://svn.apache.org/viewvc?rev=1824766&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62117
Improve error message in catalina.sh when calling 'kill -0 <pid>' fails. Based
on a suggestion from Mark Morschhaeuser.
Modified:
tomcat/trunk/bin/catalina.sh
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1824766&r1=1824765&r2=1824766&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Feb 19 15:52:43 2018
@@ -502,7 +502,7 @@ elif [ "$1" = "stop" ] ; then
if [ -s "$CATALINA_PID" ]; then
kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1
if [ $? -gt 0 ]; then
- echo "PID file found but no matching process was found. Stop
aborted."
+ echo "PID file found but either no matching process was found or the
current user does not have permission to stop the process. Stop aborted."
exit 1
fi
else
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1824766&r1=1824765&r2=1824766&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 19 15:52:43 2018
@@ -70,6 +70,11 @@
NonLoginAuthenticator has to be set for it to work (if no login method
is specified). (remm)
</fix>
+ <fix>
+ <bug>62117</bug>: Improve error message in <code>catalina.sh</code>
when
+ calling <code>kill -0 <pid></code> fails. Based on a suggestion
+ from Mark Morschhaeuser. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
