diff options
| author | Gordon Sim <gsim@apache.org> | 2010-06-24 11:22:28 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-06-24 11:22:28 +0000 |
| commit | 7d890288c04e114499ebf5fd236d4afe12e23a78 (patch) | |
| tree | 44741567e135f97e2a723acf55e7501ec793b166 /cpp/src/qpid | |
| parent | 90f59e8c07ff05fd6ceadd7bc672eb16fce56e5d (diff) | |
| download | qpid-python-7d890288c04e114499ebf5fd236d4afe12e23a78.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/broker/Message.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Queue.h | 2 |
3 files changed, 7 insertions, 4 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. |