QPID-4112: Virtualhosts recover exchanges before queues

Switch the recover order from queues,exchanges,... to exchanges,queues,.. so that when a queue with an alternate exchange
is recovered, the exchange's uuid is already in the registry.

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

1 files changed, 7 insertions, 2 deletions

diff --git a/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index ad6777d0ea..8ae4fec975 100644
--- a/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
+++ b/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
@@ -261,13 +261,18 @@ public class QueueManagementTest extends QpidBrokerTestCase
      */
     public void testAlternateExchangeSurvivesRestart() throws Exception
     {
+        String nonMandatoryExchangeName = "exch" + getName();
+
+        final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
+        managedBroker.createNewExchange(nonMandatoryExchangeName, "fanout", true);
+
         String queueName1 = getTestQueueName() + "1";
         String altExchange1 = "amq.fanout";
         String addr1WithAltExch = String.format("ADDR:%s;{create:always,node:{durable: true,type:queue,x-declare:{alternate-exchange:'%s'}}}", queueName1, altExchange1);
         Queue queue1 = _session.createQueue(addr1WithAltExch);
 
         String queueName2 = getTestQueueName() + "2";
-        String addr2WithoutAltExch = String.format("ADDR:%s;{create:always,node:{durable: true,type:queue,}}", queueName2);
+        String addr2WithoutAltExch = String.format("ADDR:%s;{create:always,node:{durable: true,type:queue}}", queueName2);
         Queue queue2 = _session.createQueue(addr2WithoutAltExch);
 
         createQueueOnBroker(queue1);
@@ -279,7 +284,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
         ManagedQueue managedQueue2 = _jmxUtils.getManagedQueue(queueName2);
         assertNull("Newly created queue2 does not have expected alternate exchange", managedQueue2.getAlternateExchange());
 
-        String altExchange2 = "amq.fanout";
+        String altExchange2 = nonMandatoryExchangeName;
         managedQueue2.setAlternateExchange(altExchange2);
 
         restartBroker();