diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-07-03 20:00:17 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-07-03 20:00:17 +0000 |
| commit | 4b7f7f1444a34197ec41d58fa45d4749b2b4badc (patch) | |
| tree | 8ae9af8d5ae2e18f41ac462eab045a5f16545b94 | |
| parent | cea79e369ed5c5c31f747dbb5f44609bc655703d (diff) | |
| download | qpid-python-4b7f7f1444a34197ec41d58fa45d4749b2b4badc.tar.gz | |
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
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp | 3 |
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) { |