Repository: activemq-artemis Updated Branches: refs/heads/master a78ed9a2b -> 0630a1813
ARTEMIS-856 small fix to avoid re-distributor being assigned a group Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b0d36ebc Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b0d36ebc Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b0d36ebc Branch: refs/heads/master Commit: b0d36ebc50a66e24f0c5fd22af53d0ab25d5e615 Parents: a78ed9a Author: Michael André Pearce <michael.andre.pea...@me.com> Authored: Tue Oct 16 22:55:24 2018 +0100 Committer: Michael Andre Pearce <michael.andre.pea...@me.com> Committed: Mon Oct 29 20:40:50 2018 +0000 ---------------------------------------------------------------------- .../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/b0d36ebc/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 dfd070f..747db5c 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 @@ -2531,7 +2531,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { removeMessageReference(holder, ref); - if (groupID != null && groupConsumer == null) { + if (groupID != null && groupConsumer == null && redistributor == null) { groups.put(groupID, consumer); } @@ -3110,7 +3110,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { HandleStatus status = handle(ref, consumer); if (status == HandleStatus.HANDLED) { - if (groupID != null && groupConsumer == null) { + if (groupID != null && groupConsumer == null && redistributor == null) { groups.put(groupID, consumer); }
