Author: markt
Date: Tue Sep 28 20:43:32 2010
New Revision: 1002349
URL: http://svn.apache.org/viewvc?rev=1002349&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49195
Avoid error message when shutting down Windows service when the shutdown port
is disabled.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1002349&r1=1002348&r2=1002349&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Sep 28
20:43:32 2010
@@ -432,6 +432,10 @@ public class Catalina {
log.error("Catalina.stop: ", e);
System.exit(1);
}
+ } else {
+ // Server object already present. Must be running as a service
+ // Shutdown hook will take care of clean-up
+ System.exit(0);
}
// Stop the existing server
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1002349&r1=1002348&r2=1002349&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 28 20:43:32 2010
@@ -53,6 +53,10 @@
provided by Jiong Wang. (markt)
</fix>
<fix>
+ <bug>49195</bug>: Don't report an error when shutting down a Windows
+ service for a Tomcat instance that has a disabled shutdown port.
(markt)
+ </fix>
+ <fix>
<bug>49209</bug>: Prevent possible AccessControlException during
undeployment when running with a security manager. Patch provided by
Sylvain Laurent.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
