summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/messaging/ConnectionOptions.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/ConnectionOptions.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/ConnectionOptions.cpp')
-rw-r--r--cpp/src/qpid/messaging/ConnectionOptions.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/qpid/messaging/ConnectionOptions.cpp b/cpp/src/qpid/messaging/ConnectionOptions.cpp
index 746666a79c..6304263844 100644
--- a/cpp/src/qpid/messaging/ConnectionOptions.cpp
+++ b/cpp/src/qpid/messaging/ConnectionOptions.cpp
@@ -115,6 +115,8 @@ void ConnectionOptions::set(const std::string& name, const qpid::types::Variant&
reconnectOnLimitExceeded = value;
} else if (name == "container-id" || name == "container_id") {
identifier = value.asString();
+ } else if (name == "nest-annotations" || name == "nest_annotations") {
+ nestAnnotations = value;
} else {
throw qpid::messaging::MessagingException(QPID_MSG("Invalid option: " << name << " not recognised"));
}