1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 3ffa34f4fa..a14b1ad8c1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -68,6 +68,7 @@ import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.store.DurableConfiguredObjectRecoverer;
 import org.apache.qpid.server.store.Event;
 import org.apache.qpid.server.store.EventListener;
+import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.txn.DtxRegistry;
 import org.apache.qpid.server.util.MapValueConverter;
 
@@ -572,10 +573,10 @@ public abstract class AbstractVirtualHost implements VirtualHost, IConnectionReg
         //Close MessageStore
         if (getMessageStore() != null)
         {
-            //Remove MessageStore Interface should not throw Exception
+            // TODO Remove MessageStore Interface should not throw Exception
             try
             {
-                getMessageStore().close();
+                getMessageStore().closeMessageStore();
             }
             catch (Exception e)
             {
@@ -584,14 +585,13 @@ public abstract class AbstractVirtualHost implements VirtualHost, IConnectionReg
         }
         if (getDurableConfigurationStore() != null)
         {
-            //Remove MessageStore Interface should not throw Exception
             try
             {
-                getDurableConfigurationStore().close();
+                getDurableConfigurationStore().closeConfigurationStore();
             }
-            catch (Exception e)
+            catch (StoreException e)
             {
-                _logger.error("Failed to close message store", e);
+                _logger.error("Failed to close configuration store", e);
             }
         }
     }