summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 0ae0594de8..649e84cb50 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/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)