QPID-2096 : Add a work around which stops durable exchanges being written to the message store. This will allow current DerbyStores to start up but will mean that the existence of the exchange in the configuration is its durability. Remove it from the config and it is gone. This differs from the way queues work.

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

1 files changed, 12 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 fa6b2285eb..9ab3592628 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
@@ -195,10 +195,22 @@ public class VirtualHost implements Accessable
         // perform a createExchange twice with the same details in the
         // MessageStore(RoutingTable) as some instances may not like that.
         // Derby being one.
+        // todo this can be removed with the resolution fo QPID-2096
         configFileRT.exchange.clear();
         
         initialiseModel(hostConfig);
 
+        //todo REMOVE Work Around for QPID-2096
+        // This means that all durable exchanges declared in the configuration
+        // will not be stored in the MessageStore.
+        // They will still be created/registered/available on startup for as
+        // long as they are contained in the configuration. However, when they
+        // are removed from the configuration they will no longer exist.
+        // This differs from durable queues as they will be writen to to the
+        // store. After QPID-2096 has been resolved exchanges will mirror that
+        // functionality.
+        configFileRT.exchange.clear();
+
         if (store != null)
         {
             _messageStore = store;