Author: markt
Date: Thu Jun 2 13:26:16 2011
New Revision: 1130539
URL: http://svn.apache.org/viewvc?rev=1130539&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51310
When stopping the Server object on shutdown call destroy() after calling stop().
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=1130539&r1=1130538&r2=1130539&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Jun 2
13:26:16 2011
@@ -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);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130539&r1=1130538&r2=1130539&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 13:26:16 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
