From bd70b013ee676871ccef1086a08efbde4edd8d35 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Wed, 27 Mar 2019 14:42:57 +0100
Subject: Don't throw NPE when close() is called without prior start()

---
 logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'logserver')

diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java b/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java
index 10ea00bbbac..55d9c2d2940 100644
--- a/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java
+++ b/logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java
@@ -38,7 +38,9 @@ public class RpcServer implements AutoCloseable {
 
     @Override
     public void close() {
-        acceptor.shutdown().join();
+        if (acceptor != null) {
+            acceptor.shutdown().join();
+        }
         supervisor.transport().shutdown().join();
     }
 }
-- 
cgit v1.2.3