QPID-1814 : Don't always attempt to create the default exchanges in the persistent store as they are always created first.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 0ae0594de8..649e84cb50 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -183,6 +183,15 @@ public class VirtualHost implements Accessable
 
         // This needs to be after the RT has been defined as it creates the default durable exchanges.
         _exchangeRegistry.initialise();
+
+        // We don't need to store the Default queues in the store as we always
+        // create them first on start up so don't clear them from the startup
+        // configuration here. This also ensures that we don't attempt to
+        // perform a createExchange twice with the same details in the
+        // MessageStore(RoutingTable) as some instances may not like that.
+        // Derby being one.
+        configFileRT.exchange.clear();
+        
         initialiseModel(hostConfig);
 
         if (store != null)