summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp3
1 files changed, 2 insertions, 1 deletions
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) {