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 54D479BC3 for ; Mon, 30 Jan 2012 23:15:24 +0000 (UTC) Received: (qmail 46873 invoked by uid 500); 30 Jan 2012 23:15:23 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 46682 invoked by uid 500); 30 Jan 2012 23:15:22 -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 46673 invoked by uid 99); 30 Jan 2012 23:15:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2012 23:15:22 +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; Mon, 30 Jan 2012 23:15:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 86FEC23888E4 for ; Mon, 30 Jan 2012 23:14:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1238078 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Date: Mon, 30 Jan 2012 23:14:59 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120130231459.86FEC23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Jan 30 23:14:59 2012 New Revision: 1238078 URL: http://svn.apache.org/viewvc?rev=1238078&view=rev Log: Remove references to MbeansDescriptorsDynamicMBeanSource that was removed in r415811 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1238078&r1=1238077&r2=1238078&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Jan 30 23:14:59 2012 @@ -581,17 +581,6 @@ public class Registry implements Registr managed=findManagedBean(type); } - if( bean instanceof DynamicMBean ) { - if( log.isDebugEnabled() ) { - log.debug( "Dynamic mbean support "); - } - // Dynamic mbean - loadDescriptors("MbeansDescriptorsDynamicMBeanSource", - bean, type); - - managed=findManagedBean(type); - } - // Still not found - use introspection if( managed==null ) { if( log.isDebugEnabled() ) { @@ -666,10 +655,7 @@ public class Registry implements Registr String type=null; Object inputsource=null; - if( source instanceof DynamicMBean ) { - sourceType="MbeansDescriptorsDynamicMBeanSource"; - inputsource=source; - } else if( source instanceof URL ) { + if( source instanceof URL ) { URL url=(URL)source; location=url.toString(); type=param; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org