[jboss-svn-commits] JBL Code SVN: r13810 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle.

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

Author: kevin.conner at jboss.com
Date: 2007-07-27 11:45:20 -0400 (Fri, 27 Jul 2007)
New Revision: 13810

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
Log:
Tidy up resource cleanup calling: JBESB-760

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-07-27 15:35:40 UTC (rev 13809)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java	2007-07-27 15:45:20 UTC (rev 13810)
@@ -168,7 +168,6 @@
             {
                destroyInstances(count - 1);
             }
-            cleanupResources() ;
             throw mle;
          }
       }
@@ -197,7 +196,6 @@
                stopInstances(count - 1);
                destroyInstances(numInstances - 1);
             }
-            cleanupResources() ;
             throw mle;
          }
       }
@@ -226,7 +224,6 @@
                stopInstances(count - 1);
                destroyInstances(numInstances - 1);
             }
-            cleanupResources() ;
             throw mle;
          }
       }
@@ -241,29 +238,23 @@
            throws ManagedLifecycleException
    {
       final int numInstances = instances.length;
-      try
+      for (int count = numInstances - 1; count >= 0; count--)
       {
-          for (int count = numInstances - 1; count >= 0; count--)
-          {
-             final ManagedLifecycle instance = instances[count];
-             try
-             {
-                instance.destroy();
-             }
-             catch (final ManagedLifecycleException mle)
-             {
-                if (count > 0)
-                {
-                   destroyInstances(count - 1);
-                }
-                throw mle;
-             }
-          }
+         final ManagedLifecycle instance = instances[count];
+         try
+         {
+            instance.destroy();
+         }
+         catch (final ManagedLifecycleException mle)
+         {
+            if (count > 0)
+            {
+               destroyInstances(count - 1);
+            }
+            throw mle;
+         }
       }
-      finally
-      {
-          cleanupResources() ;
-      }
+      cleanupResources() ;
    }
 
    /**