[jboss-svn-commits] JBL Code SVN: r15743 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb: lifecycle and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2007-10-11 05:08:03 -0400 (Thu, 11 Oct 2007)
New Revision: 15743

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
Log:
Fixed standalone reload: JBESB-1156

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java	2007-10-11 08:09:38 UTC (rev 15742)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java	2007-10-11 09:08:03 UTC (rev 15743)
@@ -157,7 +157,7 @@
             }
             catch (final LifecycleResourceException lre)
             {
-                throw new CourierException("Unexpected lifecycle resource exception whiel registering courier", lre) ;
+                throw new CourierException("Unexpected lifecycle resource exception while registering courier", lre) ;
             }
         }
         

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java	2007-10-11 08:09:38 UTC (rev 15742)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResource.java	2007-10-11 09:08:03 UTC (rev 15743)
@@ -133,7 +133,7 @@
     
     /**
      * Cleanup the specified resource.
-     * @param identity The identiy of the resource.
+     * @param identity The identity of the resource.
      */
     void cleanupResource(final String identity)
     {
@@ -149,8 +149,10 @@
         {
             writeLock.unlock() ;
         }
-            
-        cleanupLifecycleResource(factory, resource, identity) ;
+        if (resource != null)
+        {
+            cleanupLifecycleResource(factory, resource, identity) ;
+        }
     }
     
     /**

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java	2007-10-11 08:09:38 UTC (rev 15742)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java	2007-10-11 09:08:03 UTC (rev 15743)
@@ -278,7 +278,23 @@
                     resource.cleanupResource(identity) ;
                 }
             }
-            
+        }
+        finally
+        {
+            resourceLock.unlock() ;
+        }
+        // Not touching this yet, needs reworking
+        NamingContext.closeAllContexts() ;
+    }
+    
+    /**
+     * Destroy the class loader resources.
+     */
+    public void destroyResources()
+    {
+        resourceLock.lock();
+        try
+        {
             // destroy all resources associated with the class loader.
             final ClassLoader classLoader = Thread.currentThread().getContextClassLoader() ;
             final Map<Integer, Set<LifecycleResource<?>>> classLoaderMap = classLoaderResourceMap.remove(classLoader) ;
@@ -311,8 +327,6 @@
         {
             resourceLock.unlock() ;
         }
-        // Not touching this yet, needs reworking
-        NamingContext.closeAllContexts() ;
     }
 
     /**

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-10-11 08:09:38 UTC (rev 15742)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployment.java	2007-10-11 09:08:03 UTC (rev 15743)
@@ -102,6 +102,7 @@
       finally
       {
          LifecycleResourceManager.getSingleton().disassociateDeployment(deploymentName) ;
+         LifecycleResourceManager.getSingleton().destroyResources() ;
          Thread.currentThread().setContextClassLoader(old);
       }
    }