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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1002349 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 058fbc3..2e2dd3f 100644 (file)
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3133772..9b31a74 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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.