Author: ritchiem
Date: Thu Apr 16 12:22:52 2009
New Revision: 765596
URL: http://svn.apache.org/viewvc?rev=765596&view=rev
Log:
QPID-1814 : Don't always attempt to create the default exchanges in the
persistent store as they are always created first.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=765596&r1=765595&r2=765596&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
Thu Apr 16 12:22:52 2009
@@ -183,6 +183,15 @@
// 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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
