From dev-return-112067-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Thu Dec 02 16:52:43 2010 Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 73414 invoked from network); 2 Dec 2010 16:52:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Dec 2010 16:52:42 -0000 Received: (qmail 11227 invoked by uid 500); 2 Dec 2010 16:52:42 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 10982 invoked by uid 500); 2 Dec 2010 16:52:40 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 10973 invoked by uid 99); 2 Dec 2010 16:52:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 16:52:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 16:52:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 725B423888EA; Thu, 2 Dec 2010 16:51:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041448 - in /tomcat/trunk: java/org/apache/catalina/mbeans/ContainerMBean.java webapps/docs/changelog.xml Date: Thu, 02 Dec 2010 16:51:08 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101202165108.725B423888EA@eris.apache.org> Author: markt Date: Thu Dec 2 16:51:08 2010 New Revision: 1041448 URL: http://svn.apache.org/viewvc?rev=1041448&view=rev Log: Correct removal of LifeCycleListenters from Containers via JMX. Found with FindBugs Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1041448&r1=1041447&r2=1041448&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Thu Dec 2 16:51:08 2010 @@ -263,7 +263,7 @@ public class ContainerMBean extends Base LifecycleListener[] listeners = container.findLifecycleListeners(); for(LifecycleListener listener: listeners){ - if(listener.getClass().equals(type)){ + if(listener.getClass().getName().equals(type)){ container.removeLifecycleListener(listener); } } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1041448&r1=1041447&r2=1041448&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 2 16:51:08 2010 @@ -83,6 +83,10 @@ Correct handling of versioned web applications in deployer. (markt) + + Correct removal of LifeCycleListenters from + Containers via JMX. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org