diff options
| author | Gordon Sim <gsim@apache.org> | 2012-04-23 20:58:00 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2012-04-23 20:58:00 +0000 |
| commit | 2895a20d360d388f3432ad3e94ad90efc90d54da (patch) | |
| tree | 2f77fbd9ed01d39b735011671dd4a3e924fc093c /cpp/src/qpid/broker/Queue.cpp | |
| parent | 80405967e0b6a241b92b6a6e6b532aa95eab0cea (diff) | |
| download | qpid-python-2895a20d360d388f3432ad3e94ad90efc90d54da.tar.gz | |
QPID-3970: Check alternate exchange actually exists before proceeding with reroute request
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1329438 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Queue.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Queue.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 4f114fa0a7..e7305c021d 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/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&) { |