summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/messaging
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-09-20 15:44:05 +0000
committerGordon Sim <gsim@apache.org>2013-09-20 15:44:05 +0000
commitdca072ff4a19387abda9cebaa139505877f9bc7a (patch)
tree45b5f726dd011c8f22814e240e865394aa484e38 /cpp/src/qpid/messaging
parent638110d33d0e696e32a54af5f3c686a9c043ff49 (diff)
downloadqpid-python-dca072ff4a19387abda9cebaa139505877f9bc7a.tar.gz
QPID-5150: fixes for QMFv2 over AMQP 1.0
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1525044 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/messaging')
-rw-r--r--cpp/src/qpid/messaging/amqp/SenderContext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/messaging/amqp/SenderContext.cpp b/cpp/src/qpid/messaging/amqp/SenderContext.cpp
index c3a9107333..94851da273 100644
--- a/cpp/src/qpid/messaging/amqp/SenderContext.cpp
+++ b/cpp/src/qpid/messaging/amqp/SenderContext.cpp
@@ -134,6 +134,7 @@ namespace {
const std::string X_AMQP("x-amqp-");
const std::string X_AMQP_FIRST_ACQUIRER("x-amqp-first-acquirer");
const std::string X_AMQP_DELIVERY_COUNT("x-amqp-delivery-count");
+const std::string X_AMQP_0_10_APP_ID("x-amqp-0-10.app-id");
class HeaderAdapter : public qpid::amqp::MessageEncoder::Header
{
@@ -353,7 +354,7 @@ class ApplicationPropertiesAdapter : public qpid::amqp::MessageEncoder::Applicat
{
for (qpid::types::Variant::Map::const_iterator i = headers.begin(); i != headers.end(); ++i) {
//strip out values with special keys as they are sent in standard fields
- if (!startsWith(i->first, X_AMQP)) {
+ if (!startsWith(i->first, X_AMQP) || i->first == X_AMQP_0_10_APP_ID) {
qpid::amqp::CharSequence key(convert(i->first));
switch (i->second.getType()) {
case qpid::types::VAR_VOID: