summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2014-04-22 18:47:18 +0000
committerCharles E. Rolke <chug@apache.org>2014-04-22 18:47:18 +0000
commitce473df21d946aeabe32dae83933d2d167091c02 (patch)
tree2fa1347829b0bf8d1f7ff3038e34ca6cd1c8d2ed
parent50cc81fe5b8c8bb19cadb5bc5948059c47e60670 (diff)
downloadqpid-python-ce473df21d946aeabe32dae83933d2d167091c02.tar.gz
QPID-5663: [C++ Messaging] Windows AMQP 1.0 map_receiver fails - merge fix to 0.28 branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1589249 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
index 2ca8323ba2..179297278f 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
@@ -229,7 +229,8 @@ void EncodedMessage::getBody(std::string& raw, qpid::types::Variant& c) const
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();