You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by gt...@apache.org on 2013/02/21 22:26:18 UTC

svn commit: r1448809 - /activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

Author: gtully
Date: Thu Feb 21 21:26:17 2013
New Revision: 1448809

URL: http://svn.apache.org/r1448809
Log:
https://issues.apache.org/jira/browse/AMQ-4328 - AMQ3274Test, org.apache.activemq.usecases.NetworkBridgeProducerFlowControlTest - sync needs to be conditional

Modified:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1448809&r1=1448808&r2=1448809&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Thu Feb 21 21:26:17 2013
@@ -895,7 +895,12 @@ public abstract class DemandForwardingBr
 
     protected void addSubscription(DemandSubscription sub) throws IOException {
         if (sub != null) {
-            localBroker.oneway(sub.getLocalInfo());
+            if (isDuplex()) {
+                // async vm transport, need to wait for completion
+                localBroker.request(sub.getLocalInfo());
+            } else {
+                localBroker.oneway(sub.getLocalInfo());
+            }
         }
     }