QPID-3970: Check alternate exchange actually exists before proceeding with reroute request

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

2 files changed, 31 insertions, 2 deletions

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 4f114fa0a7..e7305c021d 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -1625,9 +1625,14 @@ Manageable::status_t Queue::ManagementMethod (uint32_t methodId, Args& args, str
         {
             _qmf::ArgsQueueReroute& rerouteArgs = (_qmf::ArgsQueueReroute&) args;
             boost::shared_ptr<Exchange> dest;
-            if (rerouteArgs.i_useAltExchange)
+            if (rerouteArgs.i_useAltExchange) {
+                if (!alternateExchange) {
+                    status = Manageable::STATUS_PARAMETER_INVALID;
+                    etext = "No alternate-exchange defined";
+                    break;
+                }
                 dest = alternateExchange;
-            else {
+            } else {
                 try {
                     dest = broker->getExchanges().get(rerouteArgs.i_exchange);
                 } catch(const std::exception&) {
diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/management.py b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
index a17a945e29..2dd2291b2e 100644
--- a/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
@@ -385,6 +385,30 @@ class ManagementTest (TestBase010):
         # Cleanup
         for e in ["A", "B"]: session.exchange_delete(exchange=e)
 
+    def test_reroute_invalid_alt_exchange(self):
+        """
+        Test that an error is returned for an attempt to reroute to
+        alternate exchange on a queue for which no such exchange has
+        been defined.
+        """
+        self.startQmf()
+        session = self.session
+        # create queue with no alt-exchange, and send a message to it
+        session.queue_declare(queue="q", exclusive=True, auto_delete=True)
+        props = session.delivery_properties(routing_key="q")
+        session.message_transfer(message=Message(props, "don't reroute me!"))
+
+        # attempt to reroute the message to alt-exchange
+        q = self.qmf.getObjects(_class="queue", name="q")[0]
+        result = q.reroute(1, True, "", {})
+        # verify the attempt fails...
+        self.assertEqual(result.status, 4) #invalid parameter
+
+        # ...and message is still on the queue
+        self.subscribe(destination="d", queue="q")
+        self.assertEqual("don't reroute me!", session.incoming("d").get(timeout=1).body)
+
+
     def test_methods_async (self):
         """
         """