From 76bdb447b2a504c07b265e60032c161b430d51a2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Mar 2009 18:22:09 +0000 Subject: Fix lifecycle issue in ExpiryPolicy - remove deleted messages from unexpired map. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@760087 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/ExpiryPolicy.cpp | 7 +++++++ cpp/src/qpid/cluster/ExpiryPolicy.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/cluster') diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp index 409180c499..348963f901 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -50,6 +50,13 @@ void ExpiryPolicy::willExpire(broker::Message& m) { timer.add(new ExpiryTask(this, id, m.getExpiration())); } +void ExpiryPolicy::forget(broker::Message& m) { + MessageIdMap::iterator i = unexpiredByMessage.find(&m); + assert(i != unexpiredByMessage.end()); + unexpiredById.erase(i->second); + unexpiredByMessage.erase(i); +} + bool ExpiryPolicy::hasExpired(broker::Message& m) { return unexpiredByMessage.find(&m) == unexpiredByMessage.end(); } diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/cpp/src/qpid/cluster/ExpiryPolicy.h index 9f8b1a9236..c147e54796 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.h +++ b/cpp/src/qpid/cluster/ExpiryPolicy.h @@ -49,8 +49,8 @@ class ExpiryPolicy : public broker::ExpiryPolicy ExpiryPolicy(Multicaster&, const MemberId&, broker::Timer&); void willExpire(broker::Message&); - bool hasExpired(broker::Message&); + void forget(broker::Message&); // Send expiration notice to cluster. void sendExpire(uint64_t); -- cgit v1.2.1