diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-17 17:07:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 17:07:45 +0200 |
| commit | cc127a3c898b5f5ff3d1711a656ad4ca72ef7562 (patch) | |
| tree | b76c59a30ea95c343e719c9d11bc9f91724658ee | |
| parent | cb970bf88a8d35c1970c1baad103be868e4a8f2e (diff) | |
| parent | 425f87cdb6f8c650d4502d6f66bdc2ead61f9ad1 (diff) | |
Merge pull request #3793 from vespa-engine/balder/do-not-acces-members-that-are-not-initialized
Do not access the FS4 server unless it is constructed.
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/proton.cpp | 2 |
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) { |