From dde6862aed8758c1f440086c6491581f94c6e73b Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Mon, 26 Aug 2019 08:30:49 -0500 Subject: [PATCH] ARTEMIS-2457 fix non-destructive ring q test --- .../activemq/artemis/core/server/impl/QueueImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 ea2ce33a7f..a3b4809270 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 @@ -3514,12 +3514,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { queue.decDelivering(ref); if (nonDestructive && reason == AckReason.NORMAL) { - return; - } - - // this is done to tell the difference between actual acks and just a closed consumer in the non-destructive use-case - if (nonDestructive && reason == AckReason.NORMAL) { + // this is done to tell the difference between actual acks and just a closed consumer in the non-destructive use-case ref.setInDelivery(false); + return; } if (reason == AckReason.EXPIRED) {