2 files changed, 3 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
index 9a4913b3840..1a373b6ea71 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
@@ -172,10 +172,4 @@ public class FastSearcher extends VespaBackEndSearcher {
     protected boolean isLoggingFine() {
         return getLogger().isLoggable(Level.FINE);
     }
-
-    @Override
-    public void shutDown() {
-        super.shutDown();
-        dispatcher.shutDown();
-    }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 73e5af50788..1f58a2df5c2 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -101,6 +101,7 @@ public class Dispatcher extends AbstractComponent {
              metric);
     }
 
+    /* Protected for simple mocking in tests. Beware that searchCluster is shutdown on in deconstruct() */
     protected Dispatcher(SearchCluster searchCluster,
                          DispatchConfig dispatchConfig,
                          RpcInvokerFactory rcpInvokerFactory,
@@ -108,6 +109,7 @@ public class Dispatcher extends AbstractComponent {
         this(searchCluster, dispatchConfig, rcpInvokerFactory, rcpInvokerFactory, metric);
     }
 
+    /* Protected for simple mocking in tests. Beware that searchCluster is shutdown on in deconstruct() */
     protected Dispatcher(SearchCluster searchCluster,
                          DispatchConfig dispatchConfig,
                          InvokerFactory invokerFactory,
@@ -132,6 +134,7 @@ public class Dispatcher extends AbstractComponent {
     @Override
     public void deconstruct() {
         invokerFactory.release();
+        searchCluster.shutDown();
     }
 
     public Optional<FillInvoker> getFillInvoker(Result result, VespaBackEndSearcher searcher) {
@@ -214,10 +217,6 @@ public class Dispatcher extends AbstractComponent {
         return Optional.empty();
     }
 
-    public void shutDown() {
-        searchCluster.shutDown();
-    }
-
     private void emitDispatchMetric(Optional<SearchInvoker> invoker) {
         if (invoker.isEmpty()) {
             metric.add(FDISPATCH_METRIC, 1, metricContext);