obey requests to disable including timestamp on the message even if ttl is 
enabled


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/772032f1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/772032f1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/772032f1

Branch: refs/heads/master
Commit: 772032f18e95f6834fb5ea3820e4fb9af5f7e35d
Parents: f426494
Author: Robert Gemmell <rob...@apache.org>
Authored: Wed Oct 1 12:29:40 2014 +0100
Committer: Robert Gemmell <rob...@apache.org>
Committed: Wed Oct 1 13:37:48 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/jms/JmsSession.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/772032f1/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index 495f9c8..5a808e4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -639,7 +639,11 @@ public class JmsSession implements Session, QueueSession, 
TopicSession, JmsMessa
                 timeStamp = System.currentTimeMillis();
             }
 
-            original.setJMSTimestamp(timeStamp);
+            if (!disableTimestamp) {
+                original.setJMSTimestamp(timeStamp);
+            } else {
+                original.setJMSTimestamp(0);
+            }
 
             if (hasTTL) {
                 original.setJMSExpiration(timeStamp + timeToLive);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to