summaryrefslogtreecommitdiff
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
commit79509a546b3ec27ddfd877d04df86965222c5033 (patch)
treeadd7c42c678c0bbbea70d075b7b83ed3baf2eeff
parentdf3591f592c9abd4cf64d21624b991163f4f164a (diff)
downloadqpid-python-79509a546b3ec27ddfd877d04df86965222c5033.tar.gz
QPID-3102: Only send ttl if non-zero
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1076276 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp4
1 files changed, 3 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 82358961c8..d93416da75 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/qpid/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);
}