From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Thu, 28 Feb 2013 16:14:30 +0000
Subject: Update from trunk r1375509 through r1450773

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Message.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'cpp/src/qpid/broker/Message.cpp')

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index c48e9bcfa4..431f4291ff 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -131,6 +131,18 @@ uint64_t Message::getTtl() const
     }
 }
 
+bool Message::getTtl(uint64_t ttl) const
+{
+    if (encoding->getTtl(ttl) && expiration < FAR_FUTURE) {
+        sys::Duration remaining(sys::AbsTime::now(), getExpiration());
+        // convert from ns to ms; set to 0 if expired
+        ttl = (int64_t(remaining) >= 1000000 ? int64_t(remaining)/1000000 : 0);
+        return true;
+    } else {
+        return false;
+    }
+}
+
 void Message::computeExpiration(const boost::intrusive_ptr<ExpiryPolicy>& e)
 {
     //TODO: this is still quite 0-10 specific...
-- 
cgit v1.2.1