tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r960076 - in /tomcat/trunk: java/org/apache/catalina/core/ContainerBase.java webapps/docs/changelog.xml
Date Fri, 02 Jul 2010 18:04:14 GMT
Author: markt
Date: Fri Jul  2 18:04:14 2010
New Revision: 960076

URL: http://svn.apache.org/viewvc?rev=960076&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49530
Make sure children are stopped if they are running when the parent stops.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=960076&r1=960075&r2=960076&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Jul  2 18:04:14 2010
@@ -915,14 +915,12 @@ public abstract class ContainerBase exte
             children.remove(child.getName());
         }
         
-        if (getState().isAvailable()) {
-            try {
-                if (child.getState().isAvailable()) {
-                    child.stop();
-                }
-            } catch (LifecycleException e) {
-                log.error("ContainerBase.removeChild: stop: ", e);
+        try {
+            if (child.getState().isAvailable()) {
+                child.stop();
             }
+        } catch (LifecycleException e) {
+            log.error("ContainerBase.removeChild: stop: ", e);
         }
         
         fireContainerEvent(REMOVE_CHILD_EVENT, child);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=960076&r1=960075&r2=960076&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul  2 18:04:14 2010
@@ -84,6 +84,10 @@
         rather than an empty string. (markt)
       </fix>
       <fix>
+        <bug>49530</bug>: Contexts and Servlets not stopped when Tomcat is shut
+        down. (markt)
+      </fix>
+      <fix>
         <bug>49536</bug>: If no ROOT context is deployed, ensure a 404 rather
         than a 200 is returned for requests that don't map to any other context.
         (markt)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message