Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 3476 invoked from network); 3 Oct 2002 19:46:35 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 3 Oct 2002 19:46:35 -0000 Received: (qmail 5669 invoked by uid 97); 3 Oct 2002 19:44:23 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 4698 invoked by uid 97); 3 Oct 2002 19:44:00 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 3300 invoked by uid 97); 3 Oct 2002 19:43:21 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 3 Oct 2002 19:34:47 -0000 Message-ID: <20021003193447.85009.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 2002/10/03 12:34:47 Modified: util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java Log: A fix in the object name ( ',' needs to be used as separator ). Also added unregister - need for reloads. Revision Changes Path 1.7 +19 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java Index: DynamicMBeanProxy.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DynamicMBeanProxy.java 18 Sep 2002 11:03:06 -0000 1.6 +++ DynamicMBeanProxy.java 3 Oct 2002 19:34:47 -0000 1.7 @@ -129,10 +129,10 @@ } else { instances.put( name, new Integer( 0 )); } - return "name=" + name + " seq=" + seq; + return "name=" + name + ",seq=" + seq; } - public static void createMBean( Object proxy, String domain, String name ) { + public static String createMBean( Object proxy, String domain, String name ) { try { DynamicMBeanProxy mbean=new DynamicMBeanProxy(); mbean.setReal( proxy ); @@ -142,24 +142,38 @@ mbean.setName( generateName( proxy.getClass() )); } - mbean.registerMBean( domain ); + return mbean.registerMBean( domain ); } catch( Throwable t ) { log.error( "Error creating mbean ", t ); + return null; } } - public void registerMBean( String domain ) { + public String registerMBean( String domain ) { try { // XXX use aliases, suffix only, proxy.getName(), etc - ObjectName oname=new ObjectName( domain + ": " + getName()); + String fullName=domain + ": " + getName(); + ObjectName oname=new ObjectName( fullName ); if( getMBeanServer().isRegistered( oname )) { log.info("Unregistering " + oname ); getMBeanServer().unregisterMBean( oname ); } getMBeanServer().registerMBean( this, oname ); + return fullName; } catch( Throwable t ) { log.error( "Error creating mbean ", t ); + return null; + } + } + + public static void unregisterMBean( Object o, String name ) { + try { + ObjectName oname=new ObjectName( name ); + + getMBeanServer().unregisterMBean( oname ); + } catch( Throwable t ) { + log.error( "Error unregistering mbean ", t ); } } -- To unsubscribe, e-mail: For additional commands, e-mail: