[jboss-svn-commits] JBL Code SVN: r21475 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers.

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

Author: kevin.conner at jboss.com
Date: 2008-08-12 10:55:43 -0400 (Tue, 12 Aug 2008)
New Revision: 21475

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
Log:
Release previous courier before acquiring new one: JBESB-1929

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-08-12 14:55:23 UTC (rev 21474)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-08-12 14:55:43 UTC (rev 21475)
@@ -80,16 +80,10 @@
 	public void setToEpr(EPR toEPR) throws CourierException,
 			MalformedEPRException
 	{
-		DeliverOnlyCourier old = _deliverCourier;
-                try
-                {
-                    _deliverCourier = getDeliverCourier(toEPR);
-                    _toEPR = toEPR ;
-                }
-                finally
-                {
-                    CourierUtil.cleanCourier(old) ;
-                }
+		CourierUtil.cleanCourier(_deliverCourier) ;
+		_deliverCourier = null ;
+		_deliverCourier = getDeliverCourier(toEPR);
+		_toEPR = toEPR ;
 	}
 
 	/**
@@ -98,15 +92,9 @@
 	public void setReplyToEpr(EPR replyToEPR) throws CourierException,
 			MalformedEPRException
 	{
-		PickUpOnlyCourier old = _pickupCourier;
-                try
-                {
-                    _pickupCourier = getPickupCourier(replyToEPR);
-                }
-                finally
-                {
-                    CourierUtil.cleanCourier(old) ;
-                }
+		CourierUtil.cleanCourier(_pickupCourier);
+		_pickupCourier = null ;
+		_pickupCourier = getPickupCourier(replyToEPR);
 	}
 
     public PickUpOnlyCourier getPickupCourier() {