QPID-5038: [Java Broker Tests] Fix leak from message store tests

Ensure that all message store tests close the message store under test on all code paths. This prevents a BDB thread leak manifesting
when running a BDB profile.

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

1 files changed, 20 insertions, 6 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
index ffb6ac479a..4a1a3251e3 100644
--- a/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
+++ b/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
@@ -28,18 +28,17 @@ public class DerbyMessageStoreConfigurationTest extends AbstractDurableConfigura
     private DerbyMessageStore _derbyMessageStore;
 
     @Override
-    protected void onReopenStore()
-    {
-        _derbyMessageStore = null;
-    }
-
-    @Override
     protected DerbyMessageStore createMessageStore() throws Exception
     {
         createStoreIfNecessary();
         return _derbyMessageStore;
     }
 
+    @Override
+    protected void closeMessageStore() throws Exception
+    {
+        closeStoreIfNecessary();
+    }
 
     private void createStoreIfNecessary()
     {
@@ -55,4 +54,19 @@ public class DerbyMessageStoreConfigurationTest extends AbstractDurableConfigura
         createStoreIfNecessary();
         return _derbyMessageStore;
     }
+
+    @Override
+    protected void closeConfigStore() throws Exception
+    {
+        closeStoreIfNecessary();
+    }
+
+    private void closeStoreIfNecessary() throws Exception
+    {
+        if (_derbyMessageStore != null)
+        {
+            _derbyMessageStore.close();
+            _derbyMessageStore = null;
+        }
+    }
 }