From b0d36ebc50a66e24f0c5fd22af53d0ab25d5e615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Andr=C3=A9=20Pearce?= Date: Tue, 16 Oct 2018 22:55:24 +0100 Subject: [PATCH] ARTEMIS-856 small fix to avoid re-distributor being assigned a group --- .../apache/activemq/artemis/core/server/impl/QueueImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dfd070fe2e..747db5c6ac 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); }