QPID-3087: Fixes to store interaction changes

* don't create queue on recovery
* ensure laternate exchange is set before creating store record for queue



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

1 files changed, 1 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 4e7e78c961..695943854d 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -790,13 +790,8 @@ std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue(
         if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange));
     }
 
-    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, durable, autodelete, owner, arguments);
+    std::pair<Queue::shared_ptr, bool> result = queues.declare(name, durable, autodelete, owner, alternate, arguments);
     if (result.second) {
-        if (alternate) {
-            result.first->setAlternateExchange(alternate);
-            alternate->incAlternateUsers();
-        }
-
         //add default binding:
         result.first->bind(exchanges.getDefault(), name);