ARTEMIS-1730 fix expiry without address or bindings

This commit is contained in:
Ilkka Virolainen 2018-03-02 14:18:40 +02:00 committed by Timothy Bish
parent 913d7ecac2
commit 66e81c500a
1 changed files with 2 additions and 1 deletions

View File

@ -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);
}
}