Stop the timer if no hook has been registered.

This commit is contained in:
akwizgran
2021-02-26 11:14:40 +00:00
committed by Torsten Grote
parent e9249a9463
commit 917da9ce36

View File

@@ -151,6 +151,8 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener {
if (LOG.isLoggable(WARNING)) {
LOG.warning("No cleanup hook for " + cv);
}
// Stop the timer so we don't keep trying to delete this message
db.stopCleanupTimer(txn, m);
} else if (hook.deleteMessage(txn, g, m)) {
Collection<MessageId> messageIds = deleted.get(g);
if (messageIds == null) {
@@ -160,6 +162,7 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener {
messageIds.add(m);
} else {
LOG.info("Message was not deleted");
// Stop the timer so we don't keep trying to delete this message
db.stopCleanupTimer(txn, m);
}
}