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

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

Author: tfennelly
Date: 2008-11-06 09:33:43 -0500 (Thu, 06 Nov 2008)
New Revision: 23758

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
Log:
https://jira.jboss.org/jira/browse/JBESB-1930: merging the rest of https://jira.jboss.org/jira/browse/JBESB-1929 from branches/JBESB_4_4_GA_CP after Kev was checking up on me ;) hehehehe

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-11-06 13:53:00 UTC (rev 23757)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2008-11-06 14:33:43 UTC (rev 23758)
@@ -76,16 +76,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 ;
 	}
 
 	/**
@@ -94,15 +88,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);
 	}
 
 	private DeliverOnlyCourier getDeliverCourier(EPR toEPR)