Better naming, explicit capture, and clear close.

1 files changed, 7 insertions, 5 deletions

diff --git a/filedistribution/src/tests/lib/mock-zookeeper.cpp b/filedistribution/src/tests/lib/mock-zookeeper.cpp
index f3cdd568e1e..4d39e41786a 100644
--- a/filedistribution/src/tests/lib/mock-zookeeper.cpp
+++ b/filedistribution/src/tests/lib/mock-zookeeper.cpp
@@ -58,7 +58,7 @@ struct Node {
 
 std::shared_ptr<Node> sharedRoot;
 
-void wakeUp() { }
+void doNothing() { }
 
 struct ZHandle {
     struct Worker {
@@ -96,12 +96,14 @@ struct ZHandle {
 
     ~ZHandle() {
         std::for_each(ephemeralNodes.begin(), ephemeralNodes.end(),
-                      [&] (const string & s) { zoo_delete((zhandle_t*)this, s.c_str(), 0); });
-
-        _closed.store(true);
-        watcherInvocations.push(std::ref(wakeUp));
+                      [this] (const string & s) { zoo_delete((zhandle_t*)this, s.c_str(), 0); });
+        close();
         _watchersThread.join();
     }
+    void close() {
+        _closed.store(true);
+        watcherInvocations.push(std::ref(doNothing));
+    }
 };
 
 void