[jboss-svn-commits] JBL Code SVN: r26121 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers.

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

Author: kevin.conner at jboss.com
Date: 2009-04-17 10:38:48 -0400 (Fri, 17 Apr 2009)
New Revision: 26121

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
Log:
Remove synchronization around lifecycle resource access: JBESB-2514

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java	2009-04-17 14:24:19 UTC (rev 26120)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java	2009-04-17 14:38:48 UTC (rev 26121)
@@ -139,7 +139,7 @@
          * Register the courier as part of the current set.
          * @param courier The current courier.
          */
-        private static synchronized void registerCourier(final TwoWayCourier courier)
+        private static void registerCourier(final TwoWayCourier courier)
             throws CourierException
         {
             final Exception ex ;
@@ -151,25 +151,37 @@
             {
                 ex = null ;
             }
+            final Map<TwoWayCourier, Exception> map ;
             try
             {
-                lifecycleCouriers.getLifecycleResource().put(courier, ex) ;
+                map = lifecycleCouriers.getLifecycleResource() ;
             }
             catch (final LifecycleResourceException lre)
             {
                 throw new CourierException("Unexpected lifecycle resource exception while registering courier", lre) ;
             }
+            
+            synchronized(map)
+            {
+                map.put(courier, ex) ;
+            }
         }
         
         /**
          * Deregister the courier from the current set.
          * @param courier The current courier.
          */
-        public static synchronized void deregisterCourier(final TwoWayCourier courier)
+        public static void deregisterCourier(final TwoWayCourier courier)
         {
+            final Map<TwoWayCourier, Exception> map ;
             try
             {
-                lifecycleCouriers.getLifecycleResource().remove(courier) ;
+                map = lifecycleCouriers.getLifecycleResource() ;
+                
+                synchronized(map)
+                {
+                    map.remove(courier) ;
+                }
             }
             catch (final LifecycleResourceException lre)
             {