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 2016/01/29 15:30:23 UTC
[1/2] activemq-artemis git commit: ARTEMIS-368 - [Artemis Testsuite]
TemporaryQueueTest#testBlockingWithTemporaryQueue fails
Repository: activemq-artemis
Updated Branches:
refs/heads/master f149e76b3 -> 0d6e6a35f
ARTEMIS-368 - [Artemis Testsuite] TemporaryQueueTest#testBlockingWithTemporaryQueue fails
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3663f4c0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3663f4c0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3663f4c0
Branch: refs/heads/master
Commit: 3663f4c01e69f315ea806530b78a791789d6a8ee
Parents: f149e76
Author: Erich Duda <ed...@redhat.com>
Authored: Fri Jan 29 09:57:49 2016 +0100
Committer: Erich Duda <ed...@redhat.com>
Committed: Fri Jan 29 09:57:49 2016 +0100
----------------------------------------------------------------------
.../tests/integration/client/TemporaryQueueTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3663f4c0/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 2c47632..26a50d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -570,7 +570,16 @@ public class TemporaryQueueTest extends SingleServerTestBase {
Thread.sleep(100);
}
- while (t.isAlive() && errors.get() == 0 && !prod.getProducerCredits().isBlocked()) {
+ int blockedTime = 0;
+
+ // https://issues.apache.org/jira/browse/ARTEMIS-368
+ while (t.isAlive() && errors.get() == 0 && (!prod.getProducerCredits().isBlocked() || blockedTime < 60)) {
+ if (prod.getProducerCredits().isBlocked()) {
+ blockedTime++;
+ }
+ else {
+ blockedTime = 0;
+ }
Thread.sleep(100);
}
[2/2] activemq-artemis git commit: This closes #359
Posted by cl...@apache.org.
This closes #359
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0d6e6a35
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0d6e6a35
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0d6e6a35
Branch: refs/heads/master
Commit: 0d6e6a35f571eb15238dc857c5d7f05b6e13763f
Parents: f149e76 3663f4c
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jan 29 09:30:11 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jan 29 09:30:11 2016 -0500
----------------------------------------------------------------------
.../tests/integration/client/TemporaryQueueTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------