[activemq] branch master updated: no jira - fix intermittent failure of JdbcXARecoveryBrokerTest#testQueuePersistentPreparedAcksAvailableAfterRollback

[gtully]

This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new ac4f4a8  no jira - fix intermittent failure of 
JdbcXARecoveryBrokerTest#testQueuePersistentPreparedAcksAvailableAfterRollback
ac4f4a8 is described below

commit ac4f4a82a78da6480274a5ac6b7b7b5874309e34
Author: gtully <gary.tu...@gmail.com>
AuthorDate: Fri May 17 11:46:25 2019 +0100

    no jira - fix intermittent failure of 
JdbcXARecoveryBrokerTest#testQueuePersistentPreparedAcksAvailableAfterRollback
---
 .../java/org/apache/activemq/broker/XARecoveryBrokerTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
index 80d45eb..89745a9 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
@@ -1085,15 +1085,14 @@ public class XARecoveryBrokerTest extends 
BrokerRestartTestSupport {
             consumerInfos.add(consumerInfo);
         }
 
-        for (ConsumerInfo info : consumerInfos) {
-            connection.send(info);
-        }
-
         Message message = null;
         for (ConsumerInfo info : consumerInfos) {
+            // one by one registration to avoid ordering issue with concurrent 
dispatch from composite dests broker side
+            connection.request(info);
             for (int i = 0; i < numMessages; i++) {
                 message = receiveMessage(connection);
                 assertNotNull(message);
+                LOG.info("ORIG " + message.getMessageId());
                 connection.send(createAck(info, message, 1, 
MessageAck.DELIVERED_ACK_TYPE));
             }
             MessageAck ack = createAck(info, message, numMessages, 
MessageAck.STANDARD_ACK_TYPE);
@@ -1574,6 +1573,7 @@ public class XARecoveryBrokerTest extends 
BrokerRestartTestSupport {
     protected void configureBroker(BrokerService broker) throws Exception {
         super.configureBroker(broker);
         broker.setKeepDurableSubsActive(keepDurableSubsActive);
+        maxWait = 2000;
     }
 
     public static Test suite() {