Author: markt
Date: Tue Oct 19 13:14:13 2010
New Revision: 1024228
URL: http://svn.apache.org/viewvc?rev=1024228&view=rev
Log:
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.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1024228&r1=1024227&r2=1024228&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Oct 19
13:14:13 2010
@@ -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);
}
-
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1024228&r1=1024227&r2=1024228&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 19 13:14:13 2010
@@ -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'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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
