Correct removal of LifeCycleListenters from Containers via JMX.

Found with FindBugs

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

diff --git a/java/org/apache/catalina/mbeans/ContainerMBean.java b/java/org/apache/catalina/mbeans/ContainerMBean.java
index 110d514..73a880f 100644 (file)
--- a/java/org/apache/catalina/mbeans/ContainerMBean.java
+++ b/java/org/apache/catalina/mbeans/ContainerMBean.java
@@ -263,7 +263,7 @@ public class ContainerMBean extends BaseModelMBean {
         
         LifecycleListener[] listeners = container.findLifecycleListeners();
         for(LifecycleListener listener: listeners){
-            if(listener.getClass().equals(type)){
+            if(listener.getClass().getName().equals(type)){
                 container.removeLifecycleListener(listener);
             }
         }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 78fdc06..3e25305 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,10 @@
       <fix>
         Correct handling of versioned web applications in deployer. (markt)
       </fix>
+      <fix>
+        Correct removal of <code>LifeCycleListenter</code>s from
+        <code>Container</code>s via JMX. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">