[jboss-svn-commits] JBL Code SVN: r19021 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb: lifecycle and 2 other directories.

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

Author: mark.little at jboss.com
Date: 2008-03-15 12:00:44 -0400 (Sat, 15 Mar 2008)
New Revision: 19021

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaMessageAwareListener.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1170

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2008-03-15 14:47:43 UTC (rev 19020)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java	2008-03-15 16:00:44 UTC (rev 19021)
@@ -243,7 +243,7 @@
             {
                 courier.cleanup() ;
             }
-            catch (Exception e)
+            catch (final Throwable e)
             {
                 _logger.error("Problems invoking clean() Method for class "
                                 +courier.getClass().getSimpleName(),e);

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java	2008-03-15 14:47:43 UTC (rev 19020)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java	2008-03-15 16:00:44 UTC (rev 19021)
@@ -346,7 +346,17 @@
                 while(resourceIter.hasNext())
                 {
                     final LifecycleResource<?> resource = resourceIter.next() ;
-                    resource.destroyResources() ;
+                    
+                    try
+                    {
+                	resource.destroyResources() ;
+                    }
+                    catch (final Throwable ex)
+                    {
+                	// log it, but continue on to other resources
+                	
+                	logger.warn("Caught exception "+ex+" during destroyResources.");
+                    }
                 }
             }
             

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaMessageAwareListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaMessageAwareListener.java	2008-03-15 14:47:43 UTC (rev 19020)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaMessageAwareListener.java	2008-03-15 16:00:44 UTC (rev 19021)
@@ -139,7 +139,14 @@
     {
         super.doDestroy();
         
-        pipeline.destroy() ;
+        try
+        {
+            pipeline.destroy() ;
+        }
+        catch (final Throwable ex)
+        {
+        }
+        
         pipeline = null ;
         RegistryUtil.unregister(serviceCategory, serviceName, serviceEPR) ;
     }

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2008-03-15 14:47:43 UTC (rev 19020)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java	2008-03-15 16:00:44 UTC (rev 19021)
@@ -413,8 +413,19 @@
         {
             if (_execService != null)
             {
-                _execService.shutdown() ;
-                checkExecutorTermination() ;
+        	try
+        	{
+        	    _execService.shutdown() ;
+                    checkExecutorTermination() ;
+        	}
+        	catch (final ManagedLifecycleException ex)
+        	{
+        	    throw ex;
+        	}
+        	catch (final Throwable ex)
+        	{
+        	    _logger.warn("Caught throwable during shutdown: "+ex);
+        	}
             }
 
             pipeline.destroy() ;