[jboss-svn-commits] JBL Code SVN: r11578 - labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config.

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

Author: kevin.conner at jboss.com
Date: 2007-05-02 02:24:44 -0400 (Wed, 02 May 2007)
New Revision: 11578

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
Log:
Do not call serviceController/unregister if no deployed object

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2007-05-02 06:10:26 UTC (rev 11577)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2007-05-02 06:24:44 UTC (rev 11578)
@@ -287,31 +287,37 @@
    public void stop(DeploymentInfo di)
            throws DeploymentException
    {
-      try
+      if (di.deployedObject != null)
       {
-         serviceController.stop(di.deployedObject);
+         try
+         {
+            serviceController.stop(di.deployedObject);
+         }
+         catch (Exception e)
+         {
+            throw new DeploymentException("Error during stop of ESB Module: "
+                    + di.url, e);
+         }
       }
-      catch (Exception e)
-      {
-         throw new DeploymentException("Error during stop of ESB Module: "
-                 + di.url, e);
-      }
       super.stop(di);
    }
 
    public void destroy(DeploymentInfo di)
            throws DeploymentException
    {
-      try
+      if (di.deployedObject != null)
       {
-         serviceController.destroy(di.deployedObject);
-         server.unregisterMBean(di.deployedObject);
+         try
+         {
+            serviceController.destroy(di.deployedObject);
+            server.unregisterMBean(di.deployedObject);
+         }
+         catch (Exception e)
+         {
+            throw new DeploymentException("Error during stop of ESB Module: "
+                    + di.url, e);
+         }
       }
-      catch (Exception e)
-      {
-         throw new DeploymentException("Error during stop of ESB Module: "
-                 + di.url, e);
-      }
       super.destroy(di);
    }
 }