[Jboss-cvs] JBossAS SVN: r56234 - trunk/server/src/main/org/jboss/ejb

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-08-24 19:48:38 -0400 (Thu, 24 Aug 2006)
New Revision: 56234

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
Log:
Always destroy the ejb container and remove it from the service controller

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-08-24 22:51:19 UTC (rev 56233)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-08-24 23:48:38 UTC (rev 56234)
@@ -454,13 +454,12 @@
          try
          {
             ObjectName jmxName = con.getJmxName();
-            server.unregisterMBean(jmxName);
             // The container may already be destroyed so validate metaData
             BeanMetaData metaData = con.getBeanMetaData();
             String ejbName = metaData != null ? metaData.getEjbName() : "Unknown";
             log.debug("stopService, stopping container: " + ejbName);
 
-            serviceController.stop(con.getJmxName());
+            serviceController.stop(jmxName);
          }
          catch (Exception e)
          {
@@ -502,8 +501,7 @@
          Container con = (Container) iter.previous();
          ObjectName jmxName = con.getJmxName();
          int conState = con.getState();
-         boolean destroyContainer = conState == CREATED || conState == STOPPED
-            || conState == FAILED; 
+         boolean destroyContainer = true; 
          log.debug("Looking to destroy container: " + jmxName
             + ", state: " + con.getStateString() + ", destroy: " + destroyContainer);
 
@@ -535,8 +533,11 @@
          {
             try
             {
-               serviceController.destroy(jmxName);
+                serviceController.destroy(jmxName);
+                serviceController.remove(jmxName);
                log.info("Undeployed " + con.getBeanMetaData().getEjbName());
+               if( server.isRegistered(jmxName) )
+               	server.unregisterMBean(jmxName);
             }
             catch (Throwable e)
             {
@@ -544,18 +545,6 @@
             } // end of try-catch
         }
 
-        // If the container was registered with the mbeanserver, remove it
-        if (conState != UNREGISTERED)
-        {
-            try
-            {
-               serviceController.remove(jmxName);
-            }
-            catch (Throwable e)
-            {
-               log.error("unexpected exception removing Container: " + jmxName, e);
-            } // end of try-catch
-         }
 
          // cleanup container
          con.setBeanMetaData(null);