[jboss-cvs] JBossAS SVN: r57921 - branches/JBoss_4_0_2_CP/server/src/main/org/jboss/deployment

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

Author: fnasser at redhat.com
Date: 2006-10-30 10:05:27 -0500 (Mon, 30 Oct 2006)
New Revision: 57921

Modified:
   branches/JBoss_4_0_2_CP/server/src/main/org/jboss/deployment/EARDeployer.java
Log:
ASPATCH-45: JBAS-2287: Customer needs fix of JBAS-1262 for 4.0.2 -- MBean for ear not deregistered when deploy fails

Modified: branches/JBoss_4_0_2_CP/server/src/main/org/jboss/deployment/EARDeployer.java
===================================================================
--- branches/JBoss_4_0_2_CP/server/src/main/org/jboss/deployment/EARDeployer.java	2006-10-30 14:43:11 UTC (rev 57920)
+++ branches/JBoss_4_0_2_CP/server/src/main/org/jboss/deployment/EARDeployer.java	2006-10-30 15:05:27 UTC (rev 57921)
@@ -256,11 +256,6 @@
                log.debug("Deployment Info: " + sub + ", isDirectory: " + sub.isDirectory);
             }
          }
-         EARDeployment earDeployment = new EARDeployment(di);
-         String name = earDeployment.getJMXName();
-         ObjectName objectName = new ObjectName(name);
-         di.deployedObject = objectName;
-         server.registerMBean(earDeployment, objectName);
       }
       catch (DeploymentException e)
       {
@@ -281,6 +276,11 @@
       // Create an MBean for the EAR deployment
       try
       {
+         EARDeployment earDeployment = new EARDeployment(di);
+         String name = earDeployment.getJMXName();
+         ObjectName objectName = new ObjectName(name);
+         di.deployedObject = objectName;
+         server.registerMBean(earDeployment, objectName);
          serviceController.create(di.deployedObject);
       }
       catch (Exception e)