[Jboss-cvs] JBossAS SVN: r55985 - trunk/server/src/main/org/jboss/web

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

Author: adrian at jboss.org
Date: 2006-08-16 10:14:41 -0400 (Wed, 16 Aug 2006)
New Revision: 55985

Modified:
   trunk/server/src/main/org/jboss/web/AbstractWebContainer.java
Log:
Fix web deployments to remove the MBean via the ServiceController.

Modified: trunk/server/src/main/org/jboss/web/AbstractWebContainer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/AbstractWebContainer.java	2006-08-16 13:41:35 UTC (rev 55984)
+++ trunk/server/src/main/org/jboss/web/AbstractWebContainer.java	2006-08-16 14:14:41 UTC (rev 55985)
@@ -536,8 +536,14 @@
       {
          if( jmxName != null )
          {
-            serviceController.destroy(jmxName);
-            server.unregisterMBean(jmxName);
+            try
+            {
+               serviceController.destroy(jmxName);
+            }
+            finally
+            {
+               serviceController.remove(jmxName);
+            }
          }
       }
       catch (DeploymentException e)