commit e7258ffa881e2867088423c10398f159d8806b79
author Junxiao Shi <git@mail1.yoursunny.com> Fri Aug 12 23:55:47 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Aug 12 23:55:47 2016 +0000
tree 436d412cf9a7b8db9a187499e9ece8e5339efc44
parent dd8f66140b97361615d60909e2631704b548209c

table: cleanupOnFaceRemoval doesn't rely on shared_ptr<name_tree::Entry> anymore

refs #3687

Change-Id: I3901f053bf370ca5a19a0fea72aec8eb58fcfe10

daemon/table/name-tree.cpp

diff --git a/daemon/table/name-tree.cpp b/daemon/table/name-tree.cpp
index b806cd4..adff4b3 100644
--- a/daemon/table/name-tree.cpp
+++ b/daemon/table/name-tree.cpp
@@ -118,7 +118,7 @@
 }
 
 size_t
-NameTree::eraseIfEmpty(Entry* entry)
+NameTree::eraseIfEmpty(Entry* entry, bool canEraseAncestors)
 {
   BOOST_ASSERT(entry != nullptr);
 
@@ -132,6 +132,10 @@
 
     m_ht.erase(getNode(*entry));
     ++nErased;
+
+    if (!canEraseAncestors) {
+      break;
+    }
   }
 
   if (nErased == 0) {