1 files changed, 1 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
index 9ffa2ac158..c96f0dd463 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreator.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.configuration;
 
 import org.apache.qpid.server.BrokerOptions;
-import org.apache.qpid.server.configuration.store.CommandLineOptionsHandler;
 import org.apache.qpid.server.configuration.store.XMLConfigurationEntryStore;
 import org.apache.qpid.server.plugin.QpidServiceLoader;
 
@@ -60,7 +59,7 @@ public class BrokerConfigurationStoreCreator
             throw new IllegalConfigurationException("Cannot create store for the type " + storeType);
         }
         store.open(storeLocation);
-        return new CommandLineOptionsHandler(options, store);
+        return store;
     }
 
 }