From 388c12ab3e9474e07f7b8012b1e6f1b8d14deb17 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 1 Apr 2025 15:04:58 +0200 Subject: [PATCH] [MNT-24937] Fix EventTableOutbox messages flooding the logs on bootstrap failure (#3286) --- .../java/org/alfresco/repo/event2/EventGenerator.java | 5 +---- .../main/java/org/alfresco/repo/event2/EventSender.java | 2 +- .../org/alfresco/repo/event2/EventSenderFactoryBean.java | 9 +++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java index b0fefda59f..8b23464f10 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java @@ -542,10 +542,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin @Override protected void onShutdown(ApplicationEvent applicationEvent) { - if (eventSender != null) - { - eventSender.destroy(); - } + // NOOP } protected class EventTransactionListener extends TransactionListenerAdapter diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java index d1085943da..a858b0125a 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java @@ -52,7 +52,7 @@ public interface EventSender } /** - * It's called when the application context is closing, allowing {@link org.alfresco.repo.event2.EventGenerator} to perform cleanup operations. + * It's called when the bean instance is destroyed, allowing to perform cleanup operations. */ default void destroy() { diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java index 299819dc26..2e01b403eb 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java @@ -156,4 +156,13 @@ public class EventSenderFactoryBean extends AbstractFactoryBean { return event2MessageProducer; } + + @Override + protected void destroyInstance(EventSender eventSender) + { + if (eventSender != null) + { + eventSender.destroy(); + } + } }