Minor modifications for recovery and debug.

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

3 files changed, 6 insertions, 9 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 29a7e3a6c8..1150d055cb 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -175,28 +175,28 @@ bool Queue::canAutoDelete() const{
 
 void Queue::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const string * const xid)
 {
-    if(msg->isPersistent() && store){
+    if (msg->isPersistent() && store) {
         store->enqueue(ctxt, msg, *this, xid);
     }
 }
 
 void Queue::dequeue(TransactionContext* ctxt, Message::shared_ptr& msg, const string * const xid)
 {
-    if(msg->isPersistent() && store){
+    if (msg->isPersistent() && store) {
         store->dequeue(ctxt, msg, *this, xid);
     }
 }
 
 void Queue::create()
 {
-    if(store){
+    if (store) {
         store->create(*this);
     }
 }
 
 void Queue::destroy()
 {
-    if(store){
+    if (store) {
         store->destroy(*this);
     }
 }
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index 5b7bb1ff5e..57fff37653 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -48,12 +48,10 @@ SessionHandlerFactoryImpl::SessionHandlerFactoryImpl(const std::string& _store,
     exchanges.declare(amq_topic, TopicExchange::typeName);
     exchanges.declare(amq_fanout, FanOutExchange::typeName);
     exchanges.declare(amq_match, HeadersExchange::typeName);
-    cleaner.start();
-}
 
-void SessionHandlerFactoryImpl::recover()
-{
     if(store.get()) store->recover(queues);
+
+    cleaner.start();
 }
 
 SessionHandler* SessionHandlerFactoryImpl::create(SessionContext* ctxt)
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
index 3703efcf89..fb7462ac8b 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
@@ -45,7 +45,6 @@ namespace qpid {
             AutoDelete cleaner;
         public:
             SessionHandlerFactoryImpl(const std::string& store = "", u_int32_t timeout = 30000);
-            void recover();
             virtual qpid::sys::SessionHandler* create(qpid::sys::SessionContext* ctxt);
             virtual ~SessionHandlerFactoryImpl();
         };