From 66e81c500a074f59fbdd4688a7c026b9aed9e6ad Mon Sep 17 00:00:00 2001
From: Ilkka Virolainen <ilkka.virolainen@bitwise.fi>
Date: Fri, 2 Mar 2018 14:18:40 +0200
Subject: [PATCH] ARTEMIS-1730 fix expiry without address or 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 58f31ea889..b9adf33891 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 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
 
          if (bindingList.getBindings().isEmpty()) {
             ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoBindings(expiryAddress);
+            acknowledge(tx, ref, AckReason.EXPIRED);
          } else {
             move(expiryAddress, tx, ref, true, true);
          }
@@ -2751,7 +2752,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
             ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoQueue(name);
          }
 
-         acknowledge(tx, ref);
+         acknowledge(tx, ref, AckReason.EXPIRED);
       }
    }