User: schaefera
Date: 02/03/18 17:09:19
Modified: src/main/org/jboss/management/j2ee EJB.java EJBModule.java
J2EEApplication.java J2EEManagedObject.java
JCAConnectionFactory.java
JCAManagedConnectionFactory.java JCAResource.java
JDBCDataSource.java JDBCResource.java
JMSResource.java JNDIResource.java JTAResource.java
JavaMailResource.java RMI_IIOPResource.java
ResourceAdapter.java ResourceAdapterModule.java
URLResource.java
Log:
Take out some of the exceptions reported:
- whenever a JSR-77 objects is not found for destruction ignore the exception
- whenever a Notification Listener cannot be removed because its source is
already destroyed then ignore it
Revision Changes Path
1.4 +2 -1 jboss-management/src/main/org/jboss/management/j2ee/EJB.java
Index: EJB.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/EJB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EJB.java 18 Mar 2002 22:34:02 -0000 1.3
+++ EJB.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -19,7 +19,7 @@
* {@link javax.management.j2ee.EJB EJB}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -81,6 +81,7 @@
// Now remove the EJB
pServer.unregisterMBean( new ObjectName( pEJBName ) );
}
+ catch( javax.management.InstanceNotFoundException infe ) {}
catch( Exception e ) {
lLog.error( "Could not destory JSR-77 EJB: " + pEJBName, e );
}
1.5 +3 -5
jboss-management/src/main/org/jboss/management/j2ee/EJBModule.java
Index: EJBModule.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/EJBModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EJBModule.java 16 Mar 2002 06:44:56 -0000 1.4
+++ EJBModule.java 19 Mar 2002 01:09:19 -0000 1.5
@@ -31,7 +31,7 @@
* {@link javax.management.j2ee.EJBModule EJBModule}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
* <p><b>Revisions:</b>
*
@@ -177,8 +177,8 @@
J2EEApplication.destroy( pServer, lParent.toString() );
} // end of if ()
-
}
+ catch( javax.management.InstanceNotFoundException infe ) {}
catch( Exception e ) {
lLog.error( "Could not destory JSR-77 EJBModule: " + pModuleName, e );
}
@@ -288,9 +288,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.4 +7 -12
jboss-management/src/main/org/jboss/management/j2ee/J2EEApplication.java
Index: J2EEApplication.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/J2EEApplication.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- J2EEApplication.java 16 Mar 2002 06:44:56 -0000 1.3
+++ J2EEApplication.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -24,7 +24,7 @@
* {@link javax.management.j2ee.J2EEApplication J2EEApplication}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -104,22 +104,17 @@
try {
ObjectName lApplication;
if( pName.indexOf( J2EEManagedObject.TYPE + "=" +
J2EEApplication.J2EE_TYPE ) >= 0 ) {
- lApplication = new ObjectName( pName );
+ pServer.unregisterMBean( new ObjectName( pName ) );
} else {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + J2EE_TYPE + ",name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + J2EE_TYPE + ",name=" + pName + ","
+
+ "*"
);
- lApplication = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
}
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lApplication );
}
+ catch( javax.management.InstanceNotFoundException infe ) {}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 J2EEApplication: " + pName, e );
}
1.4 +14 -1
jboss-management/src/main/org/jboss/management/j2ee/J2EEManagedObject.java
Index: J2EEManagedObject.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/J2EEManagedObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- J2EEManagedObject.java 18 Mar 2002 22:34:02 -0000 1.3
+++ J2EEManagedObject.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.security.InvalidParameterException;
import java.util.Hashtable;
+import java.util.Set;
import javax.management.JMException;
import javax.management.MalformedObjectNameException;
@@ -23,7 +24,7 @@
* {@link javax.management.j2ee.J2EEManagedObject J2EEManagedObject}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -78,6 +79,18 @@
}
// Return an empty string if type not found
return lType == null ? "" : lType;
+ }
+
+ protected static void removeObject( MBeanServer pServer, String pSearchCriteria )
+ throws JMException
+ {
+ Set lNames = pServer.queryNames(
+ new ObjectName( pSearchCriteria ),
+ null
+ );
+ if( !lNames.isEmpty() ) {
+ pServer.unregisterMBean( (ObjectName) lNames.iterator().next() );
+ }
}
// Constructors --------------------------------------------------
1.4 +8 -15
jboss-management/src/main/org/jboss/management/j2ee/JCAConnectionFactory.java
Index: JCAConnectionFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JCAConnectionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JCAConnectionFactory.java 16 Mar 2002 06:44:56 -0000 1.3
+++ JCAConnectionFactory.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -25,7 +25,7 @@
* {@link javax.management.j2ee.JCAConnectionFactory JCAConnectionFactory}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -119,22 +119,17 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JCAConnectionFactory.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JCAConnectionFactory.J2EE_TYPE + "," +
- "name=" + pName +
- "*"
+ J2EEManagedObject.TYPE + "=" + JCAConnectionFactory.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJCAConnectionFactory = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the JCA Connection Factory
- pServer.unregisterMBean( lJCAConnectionFactory );
// Now let us try to destroy the JDBC Manager
JCAResource.destroy( pServer, "JCA" );
}
+ catch( javax.management.InstanceNotFoundException infe ) {}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JCAConnectionFactory: " + pName, e );
}
@@ -271,9 +266,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +6 -12
jboss-management/src/main/org/jboss/management/j2ee/JCAManagedConnectionFactory.java
Index: JCAManagedConnectionFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JCAManagedConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JCAManagedConnectionFactory.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JCAManagedConnectionFactory.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -18,7 +18,7 @@
* {@link javax.management.j2ee.JCAManagedConnectionFactory
JCAManagedConnectionFactory}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -78,19 +78,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JCAManagedConnectionFactory.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JCAManagedConnectionFactory.J2EE_TYPE +
"," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + JCAManagedConnectionFactory.J2EE_TYPE
+ "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJCAManagedConnectionFactory = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the JCAManagedConnectionFactory
- pServer.unregisterMBean( lJCAManagedConnectionFactory );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JCAManagedConnectionFactory: " +
pName, e );
1.3 +2 -4
jboss-management/src/main/org/jboss/management/j2ee/JCAResource.java
Index: JCAResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JCAResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JCAResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JCAResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -27,7 +27,7 @@
* {@link javax.management.j2ee.JCAResource JCAResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -256,9 +256,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
*/
}
1.4 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/JDBCDataSource.java
Index: JDBCDataSource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JDBCDataSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCDataSource.java 16 Mar 2002 06:44:56 -0000 1.3
+++ JDBCDataSource.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -25,7 +25,7 @@
* {@link javax.management.j2ee.JDBCDataSource JDBCDataSource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -128,19 +128,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JDBCDataSource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JDBCDataSource.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + JDBCDataSource.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJNDI = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lJNDI );
// Now let us try to destroy the JDBC Manager
JDBCResource.destroy( pServer, "JDBC" );
}
@@ -260,9 +254,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +2 -4
jboss-management/src/main/org/jboss/management/j2ee/JDBCResource.java
Index: JDBCResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JDBCResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JDBCResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -27,7 +27,7 @@
* {@link javax.management.j2ee.JDBCResource JDBCResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -268,9 +268,7 @@
getServer().removeNotificationListener( mService, mListener );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
*/
}
1.3 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/JMSResource.java
Index: JMSResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JMSResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMSResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JMSResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -21,7 +21,7 @@
* Root class of the JBoss JSR-77 implementation of
* {@link javax.management.j2ee.JMS JMS}. *
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -101,19 +101,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JMSResource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JMSResource.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + JMSResource.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJMSResource = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lJMSResource );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JMSResource Resource", e );
@@ -177,9 +171,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/JNDIResource.java
Index: JNDIResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JNDIResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JNDIResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JNDIResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -22,7 +22,7 @@
* {@link javax.management.j2ee.JNDIResource JNDIResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -105,19 +105,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JNDIResource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JNDIResource.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + JNDIResource.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJNDIResource = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lJNDIResource );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JNDIResource: " + pName, e );
@@ -236,9 +230,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/JTAResource.java
Index: JTAResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JTAResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JTAResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JTAResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -22,7 +22,7 @@
* {@link javax.management.j2ee.JTAResource JTAResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -95,19 +95,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( JTAResource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + JTAResource.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + JTAResource.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lJTAResource = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lJTAResource );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JTAResource: " + pName, e );
@@ -226,9 +220,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +3 -4
jboss-management/src/main/org/jboss/management/j2ee/JavaMailResource.java
Index: JavaMailResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/JavaMailResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaMailResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ JavaMailResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -22,7 +22,7 @@
* {@link javax.management.j2ee.JavaMailResource JavaMailResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -94,6 +94,7 @@
// Find the Object to be destroyed
pServer.unregisterMBean( new ObjectName( pName ) );
}
+ catch( javax.management.InstanceNotFoundException infe ) {}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 JavaMail Resource", e );
}
@@ -214,9 +215,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/RMI_IIOPResource.java
Index: RMI_IIOPResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/RMI_IIOPResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RMI_IIOPResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ RMI_IIOPResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -22,7 +22,7 @@
* {@link javax.management.j2ee.RMI_IIOPResource RMI_IIOPResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -95,19 +95,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( RMI_IIOPResource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + J2EEServer.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + J2EEServer.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lRMI_IIOPResource = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lRMI_IIOPResource );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 RMI_IIOPResource: " + pName, e );
@@ -226,9 +220,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
1.3 +6 -12
jboss-management/src/main/org/jboss/management/j2ee/ResourceAdapter.java
Index: ResourceAdapter.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/ResourceAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceAdapter.java 16 Mar 2002 06:44:56 -0000 1.2
+++ ResourceAdapter.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -19,7 +19,7 @@
* {@link javax.management.j2ee.ResourceAdapter ResourceAdapter}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -69,19 +69,13 @@
public static void destroy( MBeanServer pServer, String pResourceAdapterName ) {
Logger lLog = Logger.getLogger( ResourceAdapter.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + ResourceAdapter.J2EE_TYPE + "," +
- "name=" + pResourceAdapterName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + ResourceAdapter.J2EE_TYPE + "," +
+ "name=" + pResourceAdapterName + "," +
+ "*"
);
- ObjectName lResourceAdapter = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the ResourceAdapter
- pServer.unregisterMBean( lResourceAdapter );
}
catch( Exception e ) {
lLog.error( "Could not destory JSR-77 ResourceAdapter: " +
pResourceAdapterName, e );
1.4 +17 -15
jboss-management/src/main/org/jboss/management/j2ee/ResourceAdapterModule.java
Index: ResourceAdapterModule.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/ResourceAdapterModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceAdapterModule.java 16 Mar 2002 06:44:56 -0000 1.3
+++ ResourceAdapterModule.java 19 Mar 2002 01:09:19 -0000 1.4
@@ -13,6 +13,7 @@
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.management.AttributeChangeNotification;
import javax.management.JMException;
@@ -32,7 +33,7 @@
* {@link javax.management.j2ee.ResourceAdapterModule ResourceAdapterModule}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott McLaughlin</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -165,19 +166,22 @@
"name=" + pModuleName + "," +
"*"
);
- ObjectName lResourceAdapterModule = (ObjectName) pServer.queryNames(
+ Set lNames = pServer.queryNames(
lSearch,
null
- ).iterator().next();
- // Now remove the ResourceAdapterModule
- pServer.unregisterMBean( lResourceAdapterModule );
- ObjectName lParent = (ObjectName) mCreatedParents.get(
lResourceAdapterModule );
- if( lParent != null )
- {
- lLog.info( "Remove fake JSR-77 parent Application: " +
lParent.toString() );
- J2EEApplication.destroy( pServer, lParent.toString() );
-
- } // end of if ()
+ );
+ if( !lNames.isEmpty() ) {
+ ObjectName lResourceAdapterModule = (ObjectName)
lNames.iterator().next();
+ // Now remove the ResourceAdapterModule
+ pServer.unregisterMBean( lResourceAdapterModule );
+ ObjectName lParent = (ObjectName) mCreatedParents.get(
lResourceAdapterModule );
+ if( lParent != null )
+ {
+ lLog.info( "Remove fake JSR-77 parent Application: " +
lParent.toString() );
+ J2EEApplication.destroy( pServer, lParent.toString() );
+
+ } // end of if ()
+ }
}
catch( Exception e ) {
lLog.error( "Could not destory JSR-77 ResourceAdapterModule: " +
pModuleName, e );
@@ -289,9 +293,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
*/
}
1.3 +7 -15
jboss-management/src/main/org/jboss/management/j2ee/URLResource.java
Index: URLResource.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/URLResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLResource.java 13 Mar 2002 04:42:05 -0000 1.2
+++ URLResource.java 19 Mar 2002 01:09:19 -0000 1.3
@@ -22,7 +22,7 @@
* {@link javax.management.j2ee.URLResource URLResource}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -95,19 +95,13 @@
public static void destroy( MBeanServer pServer, String pName ) {
Logger lLog = Logger.getLogger( URLResource.class );
try {
- // Find the Object to be destroyed
- ObjectName lSearch = new ObjectName(
+ J2EEManagedObject.removeObject(
+ pServer,
J2EEManagedObject.getDomainName() + ":" +
- J2EEManagedObject.TYPE + "=" + URLResource.J2EE_TYPE + "," +
- "name=" + pName + "," +
- "*"
+ J2EEManagedObject.TYPE + "=" + URLResource.J2EE_TYPE + "," +
+ "name=" + pName + "," +
+ "*"
);
- ObjectName lURLResource = (ObjectName) pServer.queryNames(
- lSearch,
- null
- ).iterator().next();
- // Now remove the J2EEApplication
- pServer.unregisterMBean( lURLResource );
}
catch( Exception e ) {
lLog.error( "Could not destroy JSR-77 URLResource: " + pName, e );
@@ -226,9 +220,7 @@
getServer().removeNotificationListener( mService, mState );
}
catch( JMException jme ) {
- //AS ToDo: later on we have to define what happens when service is null or
- //AS ToDo: not found.
- jme.printStackTrace();
+ // When the service is not available anymore then just ignore the exception
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
