Applied patches to resolve QPID-2076

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

2 files changed, 6 insertions, 3 deletions

diff --git a/cpp/src/tests/AsyncCompletion.cpp b/cpp/src/tests/AsyncCompletion.cpp
index 4492e6b6bc..e32097106f 100644
--- a/cpp/src/tests/AsyncCompletion.cpp
+++ b/cpp/src/tests/AsyncCompletion.cpp
@@ -70,9 +70,11 @@ class AsyncCompletionMessageStore : public NullMessageStore {
 QPID_AUTO_TEST_SUITE(AsyncCompletionTestSuite)
 
 QPID_AUTO_TEST_CASE(testWaitTillComplete) {
-    AsyncCompletionMessageStore* store = new AsyncCompletionMessageStore;
     SessionFixture fix;
-    fix.broker->setStore(store); // Broker will delete store.
+    AsyncCompletionMessageStore* store = new AsyncCompletionMessageStore;
+    boost::shared_ptr<qpid::broker::MessageStore> p;
+    p.reset(store);
+    fix.broker->setStore(p);
     AsyncSession s = fix.session;
 
     static const int count = 3;
diff --git a/cpp/src/tests/test_store.cpp b/cpp/src/tests/test_store.cpp
index 64a96bf71a..f2d3aa65a3 100644
--- a/cpp/src/tests/test_store.cpp
+++ b/cpp/src/tests/test_store.cpp
@@ -140,7 +140,8 @@ struct TestStorePlugin : public Plugin {
     {
         Broker* broker = dynamic_cast<Broker*>(&target);
         if (!broker) return;
-        broker->setStore (new TestStore(options.name, *broker));
+        boost::shared_ptr<MessageStore> p(new TestStore(options.name, *broker));
+        broker->setStore (p);
     }
 
     void initialize(qpid::Plugin::Target&) {}