diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2009-07-08 20:01:34 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2009-07-08 20:01:34 +0000 |
| commit | 15a5da23e5a68edea6cd0056a63d988d5046bf8a (patch) | |
| tree | 2795967a4843aa3a1c065057fe49e6fb618fc021 /cpp/src/qpid/broker/Queue.cpp | |
| parent | 7c771eec9869c897b4b41caf1aa4e5978242c13d (diff) | |
| download | qpid-python-15a5da23e5a68edea6cd0056a63d988d5046bf8a.tar.gz | |
Fix to cover this case:
1. start two nodes
2. create cluster durable queue and add some messages
3. kill one node (trigger force-persistent behaviour)
4. stop and recover remaining node
5. add another node
6. kill that new node again
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@792285 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Queue.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 5dd1adc12b..a421d16c72 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -182,6 +182,10 @@ void Queue::deliver(boost::intrusive_ptr<Message>& msg){ void Queue::recover(boost::intrusive_ptr<Message>& msg){ push(msg, true); + if (store){ + // setup synclist for recovered messages, so they don't get re-stored on lastNodeFailure + msg->addToSyncList(shared_from_this(), store); + } msg->enqueueComplete(); // mark the message as enqueued mgntEnqStats(msg); |