diff options
Diffstat (limited to 'qpid/java/client')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index 22824d9f1c..9f8c783b4b 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -92,18 +92,22 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer messageProps.clearMessageId(); } + long currentTime = 0; + if (timeToLive > 0 || !_disableTimestamps) + { + currentTime = System.currentTimeMillis(); + } + + if (timeToLive > 0) + { + deliveryProp.setTtl(timeToLive); + message.setJMSExpiration(currentTime + timeToLive); + } + if (!_disableTimestamps) { - final long currentTime = System.currentTimeMillis(); - deliveryProp.setTimestamp(currentTime); - if (timeToLive > 0) - { - deliveryProp.setTtl(timeToLive); - } - else - { - deliveryProp.setTtl(0); - } + + deliveryProp.setTimestamp(currentTime); message.setJMSTimestamp(currentTime); } |