activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-856 Fixing ScaleDownTest
Date Fri, 03 Aug 2018 13:54:51 GMT
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 <michael.andre.pearce@me.com>
Authored: Fri Aug 3 08:52:47 2018 +0100
Committer: Michael André Pearce <michael.andre.pearce@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++;
             }
 


Mime
View raw message