servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r357813 - /incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java
Date Mon, 19 Dec 2005 21:55:45 GMT
Author: gnodet
Date: Mon Dec 19 13:55:43 2005
New Revision: 357813

URL: http://svn.apache.org/viewcvs?rev=357813&view=rev
Log:
Using sendSync to send an exchange to another endpoint on the same component fails.

Modified:
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java?rev=357813&r1=357812&r2=357813&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java
(original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/servicemix/jbi/messaging/DeliveryChannelImpl.java
Mon Dec 19 13:55:43 2005
@@ -572,7 +572,8 @@
         // this is the answer, so update the syncState and notify the waiter
         // Here, we don't need to put the message in the queue
         MessageExchangeImpl theOriginal = (MessageExchangeImpl) exchangesById.get(me.getExchangeId());
-        if (theOriginal != null && theOriginal.getSyncState() == MessageExchangeImpl.SYNC_STATE_SYNC_SENT)
{
+        if (theOriginal != null && theOriginal.getSyncState() == MessageExchangeImpl.SYNC_STATE_SYNC_SENT
&&
+        	theOriginal.getRole() == me.getRole()) {
             suspendTx(theOriginal);
             synchronized (theOriginal) {
                 theOriginal.copyFrom(me);



Mime
View raw message