1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp
index 175055215c..094983e3fb 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -27,15 +27,15 @@
 
 using namespace qpid::broker;
 
-MessageStoreModule::MessageStoreModule(const std::string& name) : store(name)
-{
-}
+MessageStoreModule::MessageStoreModule(MessageStore* _store) : store(_store) {}
 
-bool MessageStoreModule::init(const Options* options)
+MessageStoreModule::~MessageStoreModule()
 {
-	TRANSFER_EXCEPTION(return store->init(options));
+    delete store;
 }
 
+bool MessageStoreModule::init(const Options*) { return true; }
+
 void MessageStoreModule::create(PersistableQueue& queue)
 {
     TRANSFER_EXCEPTION(store->create(queue));