You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2018/10/29 20:40:33 UTC
[1/2] activemq-artemis git commit: ARTEMIS-856 small fix to avoid
re-distributor being assigned a group
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 <mi...@me.com>
Authored: Tue Oct 16 22:55:24 2018 +0100
Committer: Michael Andre Pearce <mi...@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);
}
[2/2] activemq-artemis git commit: This closes #2375
Posted by mi...@apache.org.
This closes #2375
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0630a181
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0630a181
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0630a181
Branch: refs/heads/master
Commit: 0630a1813525ac40af963b5ae446258f75899931
Parents: a78ed9a b0d36eb
Author: Michael Andre Pearce <mi...@me.com>
Authored: Mon Oct 29 20:40:51 2018 +0000
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Mon Oct 29 20:40:51 2018 +0000
----------------------------------------------------------------------
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------