Applied patches to resolve QPID-2076

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

1 files changed, 5 insertions, 3 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 427226f77e..4259bb2f31 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -210,8 +210,10 @@ Broker::Broker(const Broker::Options& conf) :
         (*i)->earlyInitialize(*this);
 
     // If no plugin store module registered itself, set up the null store.
-    if (store.get() == 0)
-        setStore (new NullMessageStore());
+    if (store.get() == 0) {
+        boost::shared_ptr<MessageStore> p(new NullMessageStore());
+        setStore (p);
+    }
 
     exchanges.declare(empty, DirectExchange::typeName); // Default exchange.
 
@@ -298,7 +300,7 @@ boost::intrusive_ptr<Broker> Broker::create(const Options& opts)
     return boost::intrusive_ptr<Broker>(new Broker(opts));
 }
 
-void Broker::setStore (MessageStore* _store)
+void Broker::setStore (boost::shared_ptr<MessageStore>& _store)
 {
     store.reset(new MessageStoreModule (_store));
     queues.setStore     (store.get());