summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2013-07-03 20:00:17 +0000
committerAndrew Stitcher <astitcher@apache.org>2013-07-03 20:00:17 +0000
commit2a3f2f0dd70937a97afe0fd2f5425d4ee1bcec72 (patch)
treef92b2b6122346b9cb5197689c24ccc433e1b4fb1 /cpp
parent119efe4c0aac78b549a3135ce24c6d7fb0ae6530 (diff)
downloadqpid-python-2a3f2f0dd70937a97afe0fd2f5425d4ee1bcec72.tar.gz
QPID-4975: Only send correlation id if it isn't empty.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1499540 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index dd14d11c4c..348f9e160c 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/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) {