summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-10-17 16:01:06 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-10-17 16:01:06 +0200
commit425f87cdb6f8c650d4502d6f66bdc2ead61f9ad1 (patch)
tree4374dccacaa403d42e32671105ab45b7b2ea0a46 /searchcore
parent0465c27a3e49c73c040848212ac745bca4eae9a9 (diff)
Do not access the FS4 server unless it is constructed.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp2
1 files changed, 1 insertions, 1 deletions
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) {