Merge branch 'master' into balder/do-not-depend-on-clusterinfo

1 files changed, 5 insertions, 2 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
index fb57f5eccd6..5382999f96a 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
@@ -21,6 +21,7 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.config.ClusterConfig;
 import com.yahoo.search.dispatch.Dispatcher;
+import com.yahoo.search.dispatch.rpc.RpcResourcePool;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.vespa.config.search.DispatchConfig;
@@ -513,8 +514,10 @@ public class ClusterSearcherTestCase {
         DocumentdbInfoConfig.Builder documentDbConfig = new DocumentdbInfoConfig.Builder();
         documentDbConfig.documentdb(new DocumentdbInfoConfig.Documentdb.Builder().name("type1"));
 
-        Dispatcher dispatcher = new Dispatcher(new ComponentId("test-id"),
-                                               new DispatchConfig.Builder().build(),
+        DispatchConfig dispatchConfig = new DispatchConfig.Builder().build();
+        Dispatcher dispatcher = new Dispatcher(new RpcResourcePool(dispatchConfig),
+                                               ComponentId.createAnonymousComponentId("test-id"),
+                                               dispatchConfig,
                                                vipStatus,
                                                new MockMetric());
         ComponentRegistry<Dispatcher> dispatchers = new ComponentRegistry<>();