From: markt Date: Tue, 19 Oct 2010 13:14:13 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50107 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3864f5d0a1bac75a0cc446cf4f471d1da91b06e4;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50107 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 --- diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java index 660ac7839..f8fbffcd4 100644 --- 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 0cb57efab..35f4e5654 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -37,11 +37,22 @@

+ + + + 50107: When removing a Host via JMX, do not attempt to + destroy the host's pipeline twice. Patch provided by Eiji + Takahashi. (markt) + + + - 50105: When processing composite EL expressions use - Enum.name() rather than Enum.toString() as - required by the EL specification. (markt) + + 50105: When processing composite EL expressions use + Enum.name() rather than Enum.toString() as + required by the EL specification. (markt) +