[Jboss-cvs] JBossAS SVN: r55989 - branches/Branch_4_0/server/src/main/org/jboss/web

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

Author: adrian at jboss.org
Date: 2006-08-16 10:33:27 -0400 (Wed, 16 Aug 2006)
New Revision: 55989

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/web/AbstractWebContainer.java
Log:
Use the ServiceController to remove web deployments.

Modified: branches/Branch_4_0/server/src/main/org/jboss/web/AbstractWebContainer.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/web/AbstractWebContainer.java	2006-08-16 14:31:54 UTC (rev 55988)
+++ branches/Branch_4_0/server/src/main/org/jboss/web/AbstractWebContainer.java	2006-08-16 14:33:27 UTC (rev 55989)
@@ -523,8 +523,14 @@
       {
          if( jmxName != null )
          {
-            serviceController.destroy(jmxName);
-            server.unregisterMBean(jmxName);
+            try
+            {
+               serviceController.destroy(jmxName);
+            }
+            finally
+            {
+               serviceController.remove(jmxName);
+            }
          }
       }
       catch (DeploymentException e)