Author: chug
Date: Mon Apr 21 22:24:41 2014
New Revision: 1588994
URL: http://svn.apache.org/r1588994
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=1588994&r1=1588993&r2=1588994&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 Mon
Apr 21 22:24:41 2014
@@ -229,7 +229,7 @@ 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 =
qpid::amqp::DataBuilder(qpid::types::Variant::Map());
+ qpid::amqp::DataBuilder builder(new
qpid::types::Variant::Map());
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
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 21 22:24:41 2014
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:1072051-1079078
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp:1588966
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
