From 60a8b3893dd283b9fe9cb804c21a23e7d27d530f Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 10 Feb 2020 09:58:23 +0100
Subject: requester is never null, remove guards

---
 .../yahoo/vespa/config/proxy/RpcConfigSourceClient.java   | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'config-proxy')

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index b5669820d1a..865bb2472c2 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -171,26 +171,17 @@ class RpcConfigSourceClient implements ConfigSourceClient {
             activeSubscribers.clear();
         }
         exec.shutdown();
-        if (requester != null)
-            requester.close();
+        requester.close();
     }
 
     @Override
     public String getActiveSourceConnection() {
-        if (requester != null) {
-            return requester.getConnectionPool().getCurrent().getAddress();
-        } else {
-            return "";
-        }
+        return requester.getConnectionPool().getCurrent().getAddress();
     }
 
     @Override
     public List<String> getSourceConnections() {
-        ArrayList<String> ret = new ArrayList<>();
-        if (requester != null) {
-            ret.addAll(configSourceSet.getSources());
-        }
-        return ret;
+        return new ArrayList<>(configSourceSet.getSources());
     }
 
     /**
-- 
cgit v1.2.3