From 7d890288c04e114499ebf5fd236d4afe12e23a78 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 24 Jun 2010 11:22:28 +0000 Subject: 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 --- cpp/src/qpid/broker/Message.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (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 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() { -- cgit v1.2.1