From 4b7f7f1444a34197ec41d58fa45d4749b2b4badc Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 3 Jul 2013 20:00:17 +0000 Subject: QPID-4975: Only send correlation id if it isn't empty. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1499540 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp index dd14d11c4c..348f9e160c 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp @@ -52,7 +52,8 @@ void OutgoingMessage::convert(const qpid::messaging::Message& from) //TODO: need to avoid copying as much as possible message.setData(from.getContent()); message.getMessageProperties().setContentType(from.getContentType()); - message.getMessageProperties().setCorrelationId(from.getCorrelationId()); + if ( !from.getCorrelationId().empty() ) + message.getMessageProperties().setCorrelationId(from.getCorrelationId()); message.getMessageProperties().setUserId(from.getUserId()); const Address& address = from.getReplyTo(); if (address) { -- cgit v1.2.1