You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/07/11 12:39:21 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1274 MultipleProducersTest.wrongQueue fails

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 3ac1a16f9 -> 311072b28


ARTEMIS-1274 MultipleProducersTest.wrongQueue fails

(cherry picked from commit ab92306d81df10e6cfdc771973b39980721a6f98)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f0907f6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f0907f6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f0907f6f

Branch: refs/heads/1.x
Commit: f0907f6f3fad8b7200b88a0ceef203bfcb0883df
Parents: 3ac1a16
Author: Erich Duda <ed...@redhat.com>
Authored: Mon Jul 3 15:36:28 2017 +0200
Committer: Erich Duda <ed...@redhat.com>
Committed: Tue Jul 11 13:49:50 2017 +0200

----------------------------------------------------------------------
 .../artemis/tests/integration/client/MultipleProducersTest.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0907f6f/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
index a750312..e055ade 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
@@ -32,6 +32,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
 import org.apache.activemq.artemis.tests.util.JMSTestBase;
+import org.apache.activemq.artemis.tests.util.Wait;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -141,6 +142,9 @@ public class MultipleProducersTest extends JMSTestBase {
 
       conn.close();
 
+      Wait.waitFor(() -> server.locateQueue(queueOneName).getMessageCount() == 5);
+      Wait.waitFor(() -> server.locateQueue(queueTwoName).getMessageCount() == 5);
+
       queueOneMsgCount = server.locateQueue(queueOneName).getMessageCount();
 
       queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();


[2/2] activemq-artemis git commit: This closes #1397

Posted by cl...@apache.org.
This closes #1397


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/311072b2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/311072b2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/311072b2

Branch: refs/heads/1.x
Commit: 311072b28b26911bc3cde85f408d8bdc1fa47d2b
Parents: 3ac1a16 f0907f6
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 11 08:39:15 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 11 08:39:15 2017 -0400

----------------------------------------------------------------------
 .../artemis/tests/integration/client/MultipleProducersTest.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------