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

1 files changed, 2 insertions, 9 deletions

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 6ef41eefd12..abe6fffba39 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
@@ -83,18 +83,11 @@ public class Dispatcher extends AbstractComponent {
     public static QueryProfileType getArgumentType() { return argumentType; }
 
     @Inject
-    public Dispatcher(ComponentId clusterId,
+    public Dispatcher(RpcResourcePool resourcePool,
+                      ComponentId clusterId,
                       DispatchConfig dispatchConfig,
                       VipStatus vipStatus,
                       Metric metric) {
-        this(new RpcResourcePool(dispatchConfig), clusterId, dispatchConfig, vipStatus, metric);
-    }
-
-    private Dispatcher(RpcResourcePool resourcePool,
-                       ComponentId clusterId,
-                       DispatchConfig dispatchConfig,
-                       VipStatus vipStatus,
-                       Metric metric) {
         this(resourcePool, new SearchCluster(clusterId.stringValue(), dispatchConfig,
                                              vipStatus, new RpcPingFactory(resourcePool)),
              dispatchConfig, metric);