You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/08/26 14:17:00 UTC
[activemq-artemis] 01/03: ARTEMIS-2457 fix non-destructive ring q
test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit dde6862aed8758c1f440086c6491581f94c6e73b
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Aug 26 08:30:49 2019 -0500
ARTEMIS-2457 fix non-destructive ring q test
---
.../org/apache/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 ea2ce33..a3b4809 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) {