QPID-2691: ensure ttl adjustment uses correct expiration on cloned message

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@957511 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 10 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 1e56544920..ad67bff34b 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -55,8 +55,11 @@ Message::Message(const framing::SequenceNumber& id) :
 Message::Message(const Message& original) :
     PersistableMessage(), frames(original.frames), persistenceId(0), redelivered(false), loaded(false),
     staged(false), forcePersistentPolicy(false), publisher(0), adapter(0), 
-    expiration(FAR_FUTURE), enqueueCallback(0), dequeueCallback(0),
-    inCallback(false), requiredCredit(0) {}
+    expiration(original.expiration), enqueueCallback(0), dequeueCallback(0),
+    inCallback(false), requiredCredit(0) 
+{
+    setExpiryPolicy(original.expiryPolicy);
+}
 
 Message::~Message()
 {
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 7f7b2bc312..dd077aa564 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -141,7 +141,7 @@ bool Queue::isExcluded(boost::intrusive_ptr<Message>& msg)
     return traceExclude.size() && msg->isExcluded(traceExclude);
 }
 
-void Queue::deliver(boost::intrusive_ptr<Message>& msg){
+void Queue::deliver(boost::intrusive_ptr<Message> msg){
     if (msg->isImmediate() && getConsumerCount() == 0) {
         if (alternateExchange) {
             DeliverableMessage deliverable(msg);
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index ebef6e4433..41c6b46f2b 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -211,7 +211,7 @@ namespace qpid {
              * Delivers a message to the queue. Will record it as
              * enqueued if persistent then process it.
              */
-            QPID_BROKER_EXTERN void deliver(boost::intrusive_ptr<Message>& msg);
+            QPID_BROKER_EXTERN void deliver(boost::intrusive_ptr<Message> msg);
             /**
              * Dispatches the messages immediately to a consumer if
              * one is available or stores it for later if not.
diff --git a/cpp/src/tests/federation.py b/cpp/src/tests/federation.py
index d7f93420e9..63e3f2ba19 100755
--- a/cpp/src/tests/federation.py
+++ b/cpp/src/tests/federation.py
@@ -358,7 +358,7 @@ class FederationTests(TestBase010):
         for b, t in zip(body, trace):
             headers = {}
             if (t): headers["x-qpid.trace"]=t
-            dp = r_session.delivery_properties(routing_key="my-key")
+            dp = r_session.delivery_properties(routing_key="my-key", ttl=1000*60*5)
             mp = r_session.message_properties(application_headers=headers)
             r_session.message_transfer(destination="amq.direct", message=Message(dp, mp, b))
 
@@ -366,6 +366,8 @@ class FederationTests(TestBase010):
             msg = queue.get(timeout=5)
             self.assertEqual("yes", msg.body)
             self.assertEqual(e, self.getAppHeader(msg, "x-qpid.trace"))
+            assert(msg.get("delivery_properties").ttl > 0)
+            assert(msg.get("delivery_properties").ttl < 1000*60*50)
 
         try:
             extra = queue.get(timeout=1)