QPID-5625 : [Java Broker] ensure common configured object values are saved to the store

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

1 files changed, 8 insertions, 1 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
index 8cecbc4d0b..f914389b0e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
@@ -54,7 +54,10 @@ public class DurableConfigurationStoreHelper
     {
         Map<String, Object> attributesMap = queue.getActualAttributes();
         attributesMap.remove(ConfiguredObject.ID);
-
+        if(queue.getAlternateExchange() != null)
+        {
+            attributesMap.put(Queue.ALTERNATE_EXCHANGE, queue.getAlternateExchange().getId());
+        }
         store.update(queue.getId(), QUEUE, attributesMap);
     }
 
@@ -63,6 +66,10 @@ public class DurableConfigurationStoreHelper
 
         Map<String, Object> attributesMap = queue.getActualAttributes();
         attributesMap.remove(ConfiguredObject.ID);
+        if(queue.getAlternateExchange() != null)
+        {
+            attributesMap.put(Queue.ALTERNATE_EXCHANGE, queue.getAlternateExchange().getId());
+        }
 
         store.create(queue.getId(), QUEUE, attributesMap);
     }