svn commit: r1302614 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Mar 19 19:35:45 2012
New Revision: 1302614

URL: http://svn.apache.org/viewvc?rev=1302614&view=rev
Log: (empty)
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1302608

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1302614&r1=1302613&r2=1302614&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon 
Mar 19 19:35:45 2012
@@ -5585,7 +5585,9 @@ public class StandardContext extends Con
         // Don't reset anything that is read from a <Context.../> element since
         // <Context .../> elements are read at initialisation will not be read
         // again for this object
-        children = new HashMap<String, Container>();
+        for (Container child : findChildren()) {
+            removeChild(child);
+        }
         startupTime = 0;
         startTime = 0;
         tldScanTime = 0;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1302614&r1=1302613&r2=1302614&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 19 19:35:45 2012
@@ -108,6 +108,10 @@
         Johno Crawford &#x2014; particularly the examples. Contributions were
         also provided by Petr Praus, Jonathan Drake &amp; Slávka. (markt)
       </add>
+      <fix>
+        When stopping a Context, ensure that any Servlets registered with JMX
+        are unregistered. (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