summaryrefslogtreecommitdiffstats
path: root/logserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-27 14:42:57 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-27 14:42:57 +0100
commitbd70b013ee676871ccef1086a08efbde4edd8d35 (patch)
tree0c1295733650e3f5f8a691a86b3645032e22fd99 /logserver
parentbbc7aecaa48a73827a64cb3e355e85481c0bc63c (diff)
Don't throw NPE when close() is called without prior start()
Diffstat (limited to 'logserver')
-rw-r--r--logserver/src/main/java/ai/vespa/logserver/protocol/RpcServer.java4
1 files changed, 3 insertions, 1 deletions
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();
}
}