tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r393867 - in /tomcat/container/tc5.5.x: catalina/src/bin/catalina.sh webapps/docs/changelog.xml
Date Thu, 13 Apr 2006 17:50:28 GMT
Author: yoavs
Date: Thu Apr 13 10:50:27 2006
New Revision: 393867

URL: http://svn.apache.org/viewcvs?rev=393867&view=rev
Log:
Bugzilla 38194: http://issues.apache.org/bugzilla/show_bug.cgi?id=38194

Modified:
    tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=393867&r1=393866&r2=393867&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Thu Apr 13 10:50:27 2006
@@ -279,6 +279,8 @@
     if [ ! -z "$CATALINA_PID" ]; then
        echo "Killing: `cat $CATALINA_PID`"
        kill -9 `cat $CATALINA_PID`
+    else
+       echo "Kill failed: \$CATALINA_PID not set"
     fi
   fi
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393867&r1=393866&r2=393867&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 10:50:27 2006
@@ -62,6 +62,9 @@
       <fix>
         Correctly reset listeners when reloading a webapp (remm)
       </fix>
+      <fix>
+        <bug>38194</bug>: Don't fail silently if -force is used without CATALINA_PID,
submitted by Matthew Buckett. (yoavs)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message