ARTEMIS-1730 fix expiry without address or bindings
This commit is contained in:
parent
913d7ecac2
commit
66e81c500a
|
@ -2741,6 +2741,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
|
||||||
|
|
||||||
if (bindingList.getBindings().isEmpty()) {
|
if (bindingList.getBindings().isEmpty()) {
|
||||||
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoBindings(expiryAddress);
|
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoBindings(expiryAddress);
|
||||||
|
acknowledge(tx, ref, AckReason.EXPIRED);
|
||||||
} else {
|
} else {
|
||||||
move(expiryAddress, tx, ref, true, true);
|
move(expiryAddress, tx, ref, true, true);
|
||||||
}
|
}
|
||||||
|
@ -2751,7 +2752,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
|
||||||
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoQueue(name);
|
ActiveMQServerLogger.LOGGER.errorExpiringReferencesNoQueue(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
acknowledge(tx, ref);
|
acknowledge(tx, ref, AckReason.EXPIRED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue