From 22cdff50e28cc87eed3c306206f120c8fd3ba4a9 Mon Sep 17 00:00:00 2001 From: Kenneth Anthony Giusti Date: Tue, 20 Mar 2012 18:28:06 +0000 Subject: QPID-3877: hold msg lock across body encode. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1303068 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Message.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qpid/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp index 7093a68d6c..40dfba39f4 100644 --- a/qpid/cpp/src/qpid/broker/Message.cpp +++ b/qpid/cpp/src/qpid/broker/Message.cpp @@ -131,12 +131,10 @@ uint32_t Message::getRequiredCredit() void Message::encode(framing::Buffer& buffer) const { - { - sys::Mutex::ScopedLock l(lock); // prevent header modifications while encoding - //encode method and header frames - EncodeFrame f1(buffer); - frames.map_if(f1, TypeFilter2()); - } + sys::Mutex::ScopedLock l(lock); + //encode method and header frames + EncodeFrame f1(buffer); + frames.map_if(f1, TypeFilter2()); //then encode the payload of each content frame framing::EncodeBody f2(buffer); @@ -145,6 +143,7 @@ void Message::encode(framing::Buffer& buffer) const void Message::encodeContent(framing::Buffer& buffer) const { + sys::Mutex::ScopedLock l(lock); //encode the payload of each content frame EncodeBody f2(buffer); frames.map_if(f2, TypeFilter()); @@ -157,6 +156,7 @@ uint32_t Message::encodedSize() const uint32_t Message::encodedContentSize() const { + sys::Mutex::ScopedLock l(lock); return frames.getContentSize(); } @@ -222,8 +222,9 @@ void Message::releaseContent() store->stage(pmsg); staged = true; } - //ensure required credit is cached before content frames are released + //ensure required credit and size is cached before content frames are released getRequiredCredit(); + contentSize(); //remove any content frames from the frameset frames.remove(TypeFilter()); setContentReleased(); -- cgit v1.2.1