Author: kgiusti
Date: Thu Mar 22 19:57:53 2012
New Revision: 1304017
URL: http://svn.apache.org/viewvc?rev=1304017&view=rev
Log:
QPID-3877: merged fix to 0.16
Modified:
qpid/branches/0.16/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/0.16/qpid/cpp/src/qpid/broker/Message.cpp
Propchange: qpid/branches/0.16/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1303068
Modified: qpid/branches/0.16/qpid/cpp/src/qpid/broker/Message.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/qpid/broker/Message.cpp?rev=1304017&r1=1304016&r2=1304017&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ qpid/branches/0.16/qpid/cpp/src/qpid/broker/Message.cpp Thu Mar 22 19:57:53
2012
@@ -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<METHOD_BODY, HEADER_BODY>());
- }
+ sys::Mutex::ScopedLock l(lock);
+ //encode method and header frames
+ EncodeFrame f1(buffer);
+ frames.map_if(f1, TypeFilter2<METHOD_BODY, HEADER_BODY>());
//then encode the payload of each content frame
framing::EncodeBody f2(buffer);
@@ -145,6 +143,7 @@ void Message::encode(framing::Buffer& bu
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<CONTENT_BODY>());
@@ -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<CONTENT_BODY>());
setContentReleased();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
