Connect early as you know you will need them soon.

1 files changed, 5 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java
index a2821892358..52cb2b4c061 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java
@@ -44,13 +44,14 @@ class RpcClient implements Client {
 
         // The current shared connection. This will be recycled when it becomes invalid.
         // All access to this must be synchronized
-        private Target target = null;
+        private Target target;
 
         public RpcNodeConnection(String hostname, int port, Supervisor supervisor) {
             this.supervisor = supervisor;
             this.hostname = hostname;
             this.port = port;
             description = "rpc node connection to " + hostname + ":" + port;
+            target = supervisor.connect(new Spec(hostname, port));
         }
 
         @Override
@@ -79,17 +80,16 @@ class RpcClient implements Client {
         private void invokeAsync(Request req, double timeout, RequestWaiter waiter) {
             // TODO: Consider replacing this by a watcher on the target
             synchronized(this) { // ensure we have exactly 1 valid connection across threads
-                if (target == null || ! target.isValid())
+                if (! target.isValid()) {
                     target = supervisor.connect(new Spec(hostname, port));
+                }
             }
             target.invokeAsync(req, timeout, waiter);
         }
 
         @Override
         public void close() {
-            if (target != null) {
-                target.close();
-            }
+            target.close();
         }
 
         @Override