summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2011-03-02 16:20:23 +0000
committerGordon Sim <gsim@apache.org>2011-03-02 16:20:23 +0000
commitcd6506bd17c9284cff17b27e96afbd27356fa7aa (patch)
tree342eb2ebaf359a970c9739bda475ee59414bd14a /cpp
parent7381bac19a08c7753fbb152b714c24fe8dfce290 (diff)
downloadqpid-python-cd6506bd17c9284cff17b27e96afbd27356fa7aa.tar.gz
QPID-3102: Only send ttl if non-zero
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1076276 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index 82358961c8..d93416da75 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -59,7 +59,9 @@ void OutgoingMessage::convert(const qpid::messaging::Message& from)
message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
}
translate(from.getProperties(), message.getMessageProperties().getApplicationHeaders());
- message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
+ if (from.getTtl().getMilliseconds()) {
+ message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
+ }
if (from.getDurable()) {
message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
}