From 8284e1783d34737450b3f1a30c150f300c15032d Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Wed, 7 Oct 2020 20:54:10 +0200
Subject: Add null guards

---
 .../src/main/java/ai/vespa/metricsproxy/rpc/RpcConnector.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'metrics-proxy')

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
-- 
cgit v1.2.3