From 425f87cdb6f8c650d4502d6f66bdc2ead61f9ad1 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 17 Oct 2017 16:01:06 +0200
Subject: Do not access the FS4 server unless it is constructed.

---
 searchcore/src/vespa/searchcore/proton/server/proton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 36f19c385f7..60461fe649e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -435,7 +435,7 @@ Proton::~Proton()
         _summaryExecutor->sync();
     }
     LOG(debug, "Shutting down fs4 interface");
-    if (_metricsEngine) {
+    if (_metricsEngine && _fs4Server) {
         _metricsEngine->removeExternalMetrics(_fs4Server->getMetrics());
     }
     if (_fs4Server) {
-- 
cgit v1.2.3