Merge pull request #14766 from vespa-engine/hmusum/add-null-guards

Add null guards

1 files changed, 4 insertions, 2 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
index c9d4ad2a5ac..9408c9b917a 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java
@@ -52,8 +52,10 @@ public class RpcConnector extends AbstractComponent {
     }
 
     public void stop() {
-        acceptor.shutdown().join();
-        supervisor.transport().shutdown().join();
+        if (acceptor != null)
+            acceptor.shutdown().join();
+        if (supervisor != null)
+            supervisor.transport().shutdown().join();
     }
 
     @Override