From 3b90d9d7d890d6c6aff7abc6b6acf8981bc34e41 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Wed, 3 Jun 2009 19:22:27 +0000 Subject: This is related to QPID-1887 I incorporated the review comments and made the following changes. The current time is generated only if ttl is set or disable Timestamp is set to false. If ttl is set we set it and also calculate the expiration as current_time + ttl. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@781515 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/client/BasicMessageProducer_0_10.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'java/client/src') diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index 22824d9f1c..9f8c783b4b 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/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); } -- cgit v1.2.1