Merge pull request #25978 from vespa-engine/balder/only-close-if-there-is-something-to-close

Only close the _diskMemUsageSampler if it has been created.

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();