From 15a5da23e5a68edea6cd0056a63d988d5046bf8a Mon Sep 17 00:00:00 2001
From: "Carl C. Trieloff" <cctrieloff@apache.org>
Date: Wed, 8 Jul 2009 20:01:34 +0000
Subject: 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
---
 cpp/src/qpid/broker/Queue.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

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);
 
-- 
cgit v1.2.1