summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-02-10 11:29:17 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-02-10 11:29:17 +0000
commit2cfd6607c25ca1d511c07a6b4709f24f00c82239 (patch)
tree44de53022e9a5b0009aa0d766abeb46cf60783b6 /searchcore
parent90d35e4e86e9469515d6e29aecd570d4b4664b29 (diff)
Only close the _diskMemUsageSampler if it has been created.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 6759335914d..54009ef60f4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -55,8 +55,6 @@
#include <malloc.h>
#endif
-#include <vespa/searchlib/aggregation/forcelink.hpp>
-#include <vespa/searchlib/expression/forcelink.hpp>
#include <sstream>
#include <vespa/log/log.h>
@@ -473,7 +471,9 @@ Proton::~Proton()
_diskMemUsageSampler->notifier().removeDiskMemUsageListener(_memoryFlushConfigUpdater.get());
}
_sessionPruneHandle.reset();
- _diskMemUsageSampler->close();
+ if (_diskMemUsageSampler) {
+ _diskMemUsageSampler->close();
+ }
_scheduler.reset();
_executor.shutdown();
_executor.sync();