Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D2BB90BE for ; Sun, 5 Feb 2012 22:45:33 +0000 (UTC) Received: (qmail 39818 invoked by uid 500); 5 Feb 2012 22:45:32 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 39567 invoked by uid 500); 5 Feb 2012 22:45:31 -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 39553 invoked by uid 99); 5 Feb 2012 22:45:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Feb 2012 22:45:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 05 Feb 2012 22:45:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D645B23888D2 for ; Sun, 5 Feb 2012 22:45:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240851 - /tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Date: Sun, 05 Feb 2012 22:45:07 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120205224507.D645B23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Feb 5 22:45:07 2012 New Revision: 1240851 URL: http://svn.apache.org/viewvc?rev=1240851&view=rev Log: Remove a package dependency Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java 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=1240851&r1=1240850&r2=1240851&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Sun Feb 5 22:45:07 2012 @@ -38,7 +38,7 @@ import org.apache.catalina.core.Standard import org.apache.catalina.core.StandardHost; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.HostConfig; -import org.apache.catalina.valves.ValveBase; +// import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.modeler.BaseModelMBean; public class ContainerMBean extends BaseModelMBean { @@ -208,9 +208,12 @@ public class ContainerMBean extends Base if(container != null){ Valve[] valves = container.getPipeline().getValves(); for (int i = 0; i < valves.length; i++) { - ObjectName voname = ((ValveBase) valves[i]).getObjectName(); - if (voname.equals(oname)) { - container.getPipeline().removeValve(valves[i]); + if (valves[i] instanceof JmxEnabled) { + ObjectName voname = + ((JmxEnabled) valves[i]).getObjectName(); + if (voname.equals(oname)) { + container.getPipeline().removeValve(valves[i]); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org