Author: markt
Date: Tue Jan 8 16:26:18 2019
New Revision: 1850769
URL: http://svn.apache.org/viewvc?rev=1850769&view=rev
Log:
Correct a bug exposed in 9.0.14 and ensure that the Tomcat terminates in a
timely manner when running as a service.
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=1850769&r1=1850768&r2=1850769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Jan 8
16:26:18 2019
@@ -501,6 +501,7 @@ public class Catalina {
// Server object already present. Must be running as a service
try {
s.stop();
+ s.destroy();
} catch (LifecycleException e) {
log.error(sm.getString("catalina.stopError"), e);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1850769&r1=1850768&r2=1850769&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 8 16:26:18 2019
@@ -80,6 +80,10 @@
<update>
Add basic health check valve. (remm)
</update>
+ <fix>
+ Correct a bug exposed in 9.0.14 and ensure that the Tomcat terminates
in
+ a timely manner when running as a service. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
