activemq-commits mailing list archives

Author: gtully
Date: Tue Feb 19 13:33:20 2013
New Revision: 1447715

URL: http://svn.apache.org/r1447715
Log:
https://issues.apache.org/jira/browse/AMQ-4328 - regression in AMQ3274Test, need to sync demand
sub creation on async vm transport

Modified:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.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=1447715&r1=1447714&r2=1447715&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
Tue Feb 19 13:33:20 2013
@@ -875,7 +875,7 @@ public abstract class DemandForwardingBr
 
     protected void addSubscription(DemandSubscription sub) throws IOException {
         if (sub != null) {
-            localBroker.oneway(sub.getLocalInfo());
+            localBroker.request(sub.getLocalInfo());
         }
     }
 

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java?rev=1447715&r1=1447714&r2=1447715&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
(original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3274Test.java
Tue Feb 19 13:33:20 2013
@@ -109,8 +109,8 @@ public class AMQ3274Test {
         if (cons_client.getNumMsgReceived() == tot_expected) {
             LOG.info("Have " + tot_expected + " messages, as-expected");
         } else {
+            LOG.error("Have " + cons_client.getNumMsgReceived() + " messages; expected "
+ tot_expected);
             testError = true;
-            LOG.info("Have " + cons_client.getNumMsgReceived() + " messages; expected " +
tot_expected);
         }
 
         resp_cons.close();