Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51310

When stopping the Server object on shutdown call destroy() after calling stop().

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

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index 95c9df9..069ba4e 100644 (file)
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -691,6 +691,7 @@ public class Catalina {
                 // Nothing to do. stop() was already called
             } else {
                 s.stop();
+                s.destroy();
             }
         } catch (LifecycleException e) {
             log.error("Catalina.stop", e);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15818a9..83ba750 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -77,6 +77,10 @@
         <bug>51277</bug>: Improve error message if an application is deployed
         with an incomplete FORM authentication configuration. (markt)
       </fix>
+      <fix>
+        <bug>51310</bug>: When stopping the Server object on shutdown call
+        destroy() after calling stop(). (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">