1 files changed, 5 insertions, 8 deletions
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index bca2b02e5a3..0de2ab58aa9 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -808,16 +808,13 @@ TopicManagerImpl::reap()
     //
     // Lock sync(*this);
     //
-    map<string, TopicImplPtr>::iterator p = _topics.begin();
-    while(p != _topics.end())
+    vector<string> reaped = _instance->topicReaper()->consumeReapedTopics();
+    for(vector<string>::const_iterator p = reaped.begin(); p != reaped.end(); ++p)
     {
-        if(p->second->destroyed())
+        map<string, TopicImplPtr>::iterator q = _topics.find(*p);
+        if(q != _topics.end() && q->second->destroyed())
         {
-            _topics.erase(p++);
-        }
-        else
-        {
-            ++p;
+            _topics.erase(q);
         }
     }
 }