1 files changed, 20 insertions, 12 deletions

diff --git a/qpid/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index 3d2b3a95a9..e751a2b7c7 100644
--- a/qpid/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
@@ -136,18 +136,26 @@ class TopicExchange : public virtual Exchange {
     unsigned long nBindings;
     qpid::sys::RWlock lock;     // protects bindingTree and nBindings
     qpid::sys::RWlock cacheLock;     // protects cache
-	std::map<std::string, BindingList> bindingCache; // cache of matched routes.
-	class ClearCache {
-	private:
-		qpid::sys::RWlock* cacheLock;
-		std::map<std::string, BindingList>* bindingCache; 
-	public:
-		ClearCache(qpid::sys::RWlock* l, std::map<std::string, BindingList>* bc): cacheLock(l),bindingCache(bc) {};
-		~ClearCache(){ 
-			qpid::sys::RWlock::ScopedWlock l(*cacheLock);
-			bindingCache->clear();   
-		};
-	};
+    std::map<std::string, BindingList> bindingCache; // cache of matched routes.
+    class ClearCache {
+    private:
+        qpid::sys::RWlock* cacheLock;
+        std::map<std::string, BindingList>* bindingCache;
+	bool cleared;
+    public:
+        ClearCache(qpid::sys::RWlock* l, std::map<std::string, BindingList>* bc): cacheLock(l),
+             bindingCache(bc),cleared(false) {};
+        void clearCache() {
+             qpid::sys::RWlock::ScopedWlock l(*cacheLock);
+             if (!cleared) {
+                 bindingCache->clear();
+                 cleared =true;
+             }
+        };
+        ~ClearCache(){
+	     clearCache();
+        };
+    };
     bool isBound(Queue::shared_ptr queue, const std::string& pattern);
 
     class ReOriginIter;