Close ComponentsDeleter properly.

2 files changed, 8 insertions, 5 deletions

diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
index c184f5e1ae7..0aa5eb6cc80 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
@@ -60,15 +60,18 @@ ComponentsDeleter::waitForAllComponentsDeleted()
 void
 ComponentsDeleter::close()
 {
-    LockGuard guard(_trackedComponentsMutex);
-    _closed = true;
+    {
+        LockGuard guard(_trackedComponentsMutex);
+        _closed = true;
+    }
+    _deleteRequests.push([]() { LOG(debug, "I am the last one, hurry up and shutdown"); });
 }
 
 bool
 ComponentsDeleter::allComponentsDeleted()
 {
     LockGuard guard(_trackedComponentsMutex);
-    return _trackedComponents.empty() && _deleteRequests.empty();
+    return _closed && _trackedComponents.empty() && _deleteRequests.empty();
 }
 
 void
diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
index 055f5fab242..de92f041da7 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.h
@@ -39,7 +39,7 @@ class ComponentsDeleter {
 
     template <class T>
     void requestDelete(T* component) {
-        _deleteRequests.push([&, component]() { deleteComponent<T>(component); });
+        _deleteRequests.push([this, component]() { deleteComponent<T>(component); });
     }
 
     void waitForAllComponentsDeleted();
@@ -65,7 +65,7 @@ class ComponentsDeleter {
         }
 
         _trackedComponents[t] = typeid(t).name();
-        return std::shared_ptr<T>(t, [&](T * p) { requestDelete<T>(p); });
+        return std::shared_ptr<T>(t, [this](T * p) { requestDelete<T>(p); });
     }
 };
 }