summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-09-02 16:22:24 +0000
committerGordon Sim <gsim@apache.org>2013-09-02 16:22:24 +0000
commit27fbcb5efc5af79c6d2bf69409c4ff267c33bc6a (patch)
tree4f26a2011b18878c48791f385a66be0c7c5396ad /cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
parentf68bb96b236f92fb768438a2c9f315f89ce6a5db (diff)
downloadqpid-python-27fbcb5efc5af79c6d2bf69409c4ff267c33bc6a.tar.gz
QPID-5106: handle annotations properly and add option to control whether annotations are nested or not on fetch()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1519466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/messaging/amqp/ConnectionContext.cpp')
-rw-r--r--cpp/src/qpid/messaging/amqp/ConnectionContext.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
index 0d2640eb26..0d4885c4c3 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
+++ b/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
@@ -203,6 +203,7 @@ bool ConnectionContext::get(boost::shared_ptr<SessionContext> ssn, boost::shared
if (current) {
qpid::messaging::MessageImpl& impl = MessageImplAccess::get(message);
boost::shared_ptr<EncodedMessage> encoded(new EncodedMessage(pn_delivery_pending(current)));
+ encoded->setNestAnnotationsOption(nestAnnotations);
ssize_t read = pn_link_recv(lnk->receiver, encoded->getData(), encoded->getSize());
if (read < 0) throw qpid::messaging::MessagingException("Failed to read message");
encoded->trim((size_t) read);