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 2018/08/03 13:54:51 UTC
[1/2] activemq-artemis git commit: ARTEMIS-856 Fixing ScaleDownTest
Repository: activemq-artemis
Updated Branches:
refs/heads/master 77989c376 -> a6ecdcb44
ARTEMIS-856 Fixing ScaleDownTest
Don't increment the pos if redistributor. causes pos to be > size thus index out of bounds when getting the consumer on next loop.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/825081cf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/825081cf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/825081cf
Branch: refs/heads/master
Commit: 825081cfc095d52541ebc5631f031059618d871d
Parents: 77989c3
Author: Michael André Pearce <mi...@me.com>
Authored: Fri Aug 3 08:52:47 2018 +0100
Committer: Michael André Pearce <mi...@me.com>
Committed: Fri Aug 3 10:48:59 2018 +0100
----------------------------------------------------------------------
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/825081cf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 1f0c7af..0d4c686 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2516,7 +2516,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
// Only move onto the next position if the consumer on the current position was used.
// When using group we don't need to load balance to the next position
- if (!exclusive && groupConsumer == null) {
+ if (redistributor == null && !exclusive && groupConsumer == null) {
pos++;
}
@@ -3029,7 +3029,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
}
// Only move onto the next position if the consumer on the current position was used.
- if (!exclusive && groupConsumer == null) {
+ if (redistributor == null && !exclusive && groupConsumer == null) {
pos++;
}
[2/2] activemq-artemis git commit: This closes #2212
Posted by cl...@apache.org.
This closes #2212
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a6ecdcb4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a6ecdcb4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a6ecdcb4
Branch: refs/heads/master
Commit: a6ecdcb44f312277c66f8dc4bd258e175b9534f3
Parents: 77989c3 825081c
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Aug 3 09:54:41 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Aug 3 09:54:41 2018 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------