From ec0e348d1d14679f72ce704555dd2605880bddfa Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 11 May 2009 13:11:42 +0000 Subject: Fix leak of Decoder map entries. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@773552 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/Decoder.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/cluster/Decoder.cpp') diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/cpp/src/qpid/cluster/Decoder.cpp index b337ef43f4..6f65b3852a 100644 --- a/cpp/src/qpid/cluster/Decoder.cpp +++ b/cpp/src/qpid/cluster/Decoder.cpp @@ -29,6 +29,7 @@ namespace qpid { namespace cluster { void Decoder::decode(const EventHeader& eh, const char* data) { + sys::Mutex::ScopedLock l(lock); assert(eh.getType() == DATA); // Only handle connection data events. const char* cp = static_cast(data); framing::Buffer buf(const_cast(cp), eh.getSize()); @@ -36,26 +37,24 @@ void Decoder::decode(const EventHeader& eh, const char* data) { if (decoder.decode(buf)) { // Decoded a frame framing::AMQFrame frame(decoder.getFrame()); while (decoder.decode(buf)) { - process(EventFrame(eh, frame)); + callback(EventFrame(eh, frame)); frame = decoder.getFrame(); } // Set read-credit on the last frame ending in this event. // Credit will be given when this frame is processed. - process(EventFrame(eh, frame, 1)); + callback(EventFrame(eh, frame, 1)); } else { // We must give 1 unit read credit per event. // This event does not complete any frames so // send an empty frame with the read credit. - process(EventFrame(eh, framing::AMQFrame(), 1)); + callback(EventFrame(eh, framing::AMQFrame(), 1)); } } -void Decoder::process(const EventFrame& ef) { - //need to check that this is not the empty frame mentioned above - if (ef.frame.getBody() && ef.frame.getMethod() && ef.frame.getMethod()->isA()) - map.erase(ef.connectionId); - callback(ef); +void Decoder::erase(const ConnectionId& c) { + sys::Mutex::ScopedLock l(lock); + map.erase(c); } }} // namespace qpid::cluster -- cgit v1.2.1