billbarker 2003/10/12 23:34:06
Modified: jk/java/org/apache/jk/common ModJkMX.java
Log:
Slightly improving on sordid hack.
It's still too ugly for words, but at least I know it works with modeler-1.1.
Revision Changes Path
1.7 +10 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ModJkMX.java
Index: ModJkMX.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ModJkMX.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ModJkMX.java 11 Oct 2003 06:10:00 -0000 1.6
+++ ModJkMX.java 13 Oct 2003 06:34:06 -0000 1.7
@@ -173,13 +173,20 @@
// We should keep track of loaded beans and call stop.
// Modeler should do it...
Iterator mbeansIt=mbeans.values().iterator();
+ MBeanServer mbserver = Registry.getRegistry().getMBeanServer();
while( mbeansIt.hasNext()) {
MBeanProxy proxy=(MBeanProxy)mbeansIt.next();
Object ooname = proxy.getObjectName();
if( ooname != null ) {
- String soname = ooname.toString();
- ObjectName oname = new ObjectName(soname);
- Registry.getRegistry().getMBeanServer().unregisterMBean(oname);
+ ObjectName oname = null;
+ if(ooname instanceof ObjectName) {
+ oname = (ObjectName)ooname;
+ } else if(ooname instanceof String) {
+ oname = new ObjectName((String)ooname);
+ }
+ if( oname != null ) {
+ mbserver.unregisterMBean(oname);
+ }
}
}
} catch( Throwable t ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
