From c9e544b19e8990cf28798df239f83248d2aae07d Mon Sep 17 00:00:00 2001 From: Ilkka Virolainen Date: Fri, 2 Mar 2018 14:18:40 +0200 Subject: [PATCH] Added acknowledgements for messages expired without expiry address bindings --- .../apache/activemq/artemis/core/server/impl/QueueImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 58f31ea8890..b9adf338915 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 @@ -2741,6 +2741,7 @@ private void expire(final Transaction tx, final MessageReference ref) throws Exc if (bindingList.getBindings().isEmpty()) { ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoBindings(expiryAddress); + acknowledge(tx, ref, AckReason.EXPIRED); } else { move(expiryAddress, tx, ref, true, true); } @@ -2751,7 +2752,7 @@ private void expire(final Transaction tx, final MessageReference ref) throws Exc ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoQueue(name); } - acknowledge(tx, ref); + acknowledge(tx, ref, AckReason.EXPIRED); } }