Author: chug
Date: Tue Apr 22 18:47:18 2014
New Revision: 1589249
URL: http://svn.apache.org/r1589249
Log:
QPID-5663: [C++ Messaging] Windows AMQP 1.0 map_receiver fails - merge fix to
0.28 branch
Modified:
qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
(contents, props changed)
Modified: qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp?rev=1589249&r1=1589248&r2=1589249&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
(original)
+++ qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp Tue
Apr 22 18:47:18 2014
@@ -229,7 +229,8 @@ void EncodedMessage::getBody(std::string
c = builder.getList();
raw.assign(body.data, body.size);
} else if (bodyType == qpid::amqp::typecodes::MAP_NAME) {
- qpid::amqp::DataBuilder builder(new
qpid::types::Variant::Map());
+ qpid::types::Variant v = qpid::types::Variant::Map();
+ qpid::amqp::DataBuilder builder(v);
qpid::amqp::Decoder decoder(body.data, body.size);
decoder.read(builder);
c = builder.getValue().asMap();
Propchange:
qpid/branches/0.28/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:r1589222
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
