diff options
Diffstat (limited to 'vespaclient-container-plugin/src')
-rw-r--r-- | vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java index 9a1aaa33720..2a774995601 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java @@ -144,20 +144,5 @@ public class FeedHandler extends ThreadedHttpRequestHandler { } } - @Override - protected void destroy() { - feedHandlerV3.destroy(); - // We are forking this to avoid that accidental dereferrencing causes any random thread doing destruction. - // This caused a deadlock when the single Messenger thread in MessageBus was the last one referring this - // and started destructing something that required something only the messenger thread could provide. - Thread destroyer = new Thread(() -> { - internalDestroy(); - }); - destroyer.setDaemon(true); - destroyer.start(); - } - - private void internalDestroy() { - super.destroy(); - } + @Override protected void destroy() { feedHandlerV3.destroy(); } } |