diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-09-24 13:36:47 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-09-24 13:36:47 +0200 |
commit | f8f6fa6b4ceed96f2fcfb98e7fcce0bfd7bdf0c6 (patch) | |
tree | 35725c1ec0c523878d00f2b11c947081000f13b6 /config-proxy | |
parent | 336dae892950b3e24b35f20b777b74c5af99f183 (diff) |
No need to shutdown/close more than once
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 dfd81341e5d..095bde76c39 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 @@ -182,9 +182,6 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { shutdownSourceConnections(); delayedResponsesFuture.cancel(true); delayedResponsesScheduler.shutdownNow(); - nextConfigFuture.cancel(true); - nextConfigScheduler.shutdownNow(); - requester.close(); supervisor.transport().shutdown().join(); } @@ -195,6 +192,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { public void shutdownSourceConnections() { activeSubscribers.values().forEach(Subscriber::cancel); activeSubscribers.clear(); + nextConfigFuture.cancel(true); nextConfigScheduler.shutdownNow(); requester.close(); } |