projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cea95ce)
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50107
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 19 Oct 2010 13:14:13 +0000 (13:14 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 19 Oct 2010 13:14:13 +0000 (13:14 +0000)
When removing a Host via JMX, do not attempt to destroy the host's pipeline twice.
Patch provided by Eiji Takahashi.

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

java/org/apache/catalina/mbeans/MBeanFactory.java patch | blob | history
webapps/docs/changelog.xml patch | blob | history

diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java
index 660ac78..f8fbffc 100644 (file)
--- a/java/org/apache/catalina/mbeans/MBeanFactory.java
+++ b/java/org/apache/catalina/mbeans/MBeanFactory.java
@@ -907,12 +907,8 @@ public class MBeanFactory {
 
         // Remove this component from its parent component
         if(host!=null) {
-            if(host instanceof StandardHost)
-                ((StandardHost)host).destroy();
-            else
-                engine.removeChild(host);
+            engine.removeChild(host);
         }
-
     }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cb57ef..35f4e56 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -37,11 +37,22 @@
 <body>
 <!--  Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Other -->
 <section name="Tomcat 7.0.5 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>50107</bug>: When removing a Host via JMX, do not attempt to
+        destroy the host&apos;s pipeline twice. Patch provided by Eiji
+        Takahashi. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Jasper">
     <changelog>
-      <bug>50105</bug>: When processing composite EL expressions use
-      <code>Enum.name()</code> rather than <code>Enum.toString()</code> as
-      required by the EL specification. (markt)
+      <fix>
+        <bug>50105</bug>: When processing composite EL expressions use
+        <code>Enum.name()</code> rather than <code>Enum.toString()</code> as
+        required by the EL specification. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">
Unnamed repository; edit this file to name it for gitweb.