tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r1678326 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.sh webapps/docs/changelog.xml
Date Fri, 08 May 2015 10:51:33 GMT
Author: jfclere
Date: Fri May  8 10:51:33 2015
New Revision: 1678326

URL: http://svn.apache.org/r1678326
Log:
Commit fix for BZ57801.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/bin/catalina.sh
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1678326&r1=1678325&r2=1678326&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May  8 10:51:33 2015
@@ -58,17 +58,6 @@ PATCHES PROPOSED TO BACKPORT:
          http://markmail.org/message/ey2agr4eg5ws5stc
 
 
-* Improve catalina.sh error message, the PID read from the PID file during
-  startup is already taken by an existing process.
-  trunk: http://svn.apache.org/r1672272
-         http://svn.apache.org/r1672284
-  tc8  : http://svn.apache.org/r1672273
-         http://svn.apache.org/r1672285
-  tc7  : http://svn.apache.org/r1672274
-         http://svn.apache.org/r1672286
-  +1: rjung, kkolinko, markt
-  -1:
-
 * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896
   Backport org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option
 

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=1678326&r1=1678325&r2=1678326&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Fri May  8 10:51:33 2015
@@ -321,6 +321,8 @@ elif [ "$1" = "start" ] ; then
           ps -p $PID >/dev/null 2>&1
           if [ $? -eq 0 ] ; then
             echo "Tomcat appears to still be running with PID $PID. Start aborted."
+            echo "If the following process is not a Tomcat process, remove the PID file and
try again:"
+            ps -f -p $PID
             exit 1
           else
             echo "Removing/clearing stale PID file."

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1678326&r1=1678325&r2=1678326&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May  8 10:51:33 2015
@@ -43,7 +43,7 @@
 <!-- Section names:
  General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
 -->
-<section name="Tomcat 6.0.44 (markt)">
+<section name="Tomcat 6.0.44 (jfclere)">
   <subsection name="Catalina">
     <changelog>
       <fix>
@@ -110,6 +110,10 @@
         Simplify code in <code>ProtectedFunctionMapper</code> class of
         Jasper runtime. (kkolinko)
       </fix>
+      <fix>
+        <bug>57801</bug>: Improve the error message in the start script in case
+        the PID read from the PID file is already owned by a process. (rjung)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">



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


Mime
View raw message