diff options
| author | Gordon Sim <gsim@apache.org> | 2009-11-19 22:07:43 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-11-19 22:07:43 +0000 |
| commit | ee295bce4cccf969da56bfe19ffb2fb9bec3fd06 (patch) | |
| tree | 39b12d943d29105e62e67c5fcaf7ba96a2952f42 | |
| parent | 954411e9b22e9032130a80143c74ce8bf1a6de3a (diff) | |
| download | qpid-python-ee295bce4cccf969da56bfe19ffb2fb9bec3fd06.tar.gz | |
In exchange-bound, set queue-not-found correctly even if exchange is not found.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@882322 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SessionAdapter.cpp | 2 | ||||
| -rw-r--r-- | qpid/python/tests_0-10/query.py | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp index 5e5d79343a..a7743d95ab 100644 --- a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp @@ -256,7 +256,7 @@ ExchangeBoundResult SessionAdapter::ExchangeHandlerImpl::bound(const std::string } if (!exchange) { - return ExchangeBoundResult(true, false, false, false, false); + return ExchangeBoundResult(true, (!queueName.empty() && !queue), false, false, false); } else if (!queueName.empty() && !queue) { return ExchangeBoundResult(false, true, false, false, false); } else if (exchange->isBound(queue, key.empty() ? 0 : &key, args.count() > 0 ? &args : &args)) { diff --git a/qpid/python/tests_0-10/query.py b/qpid/python/tests_0-10/query.py index 311df84096..d57e964982 100644 --- a/qpid/python/tests_0-10/query.py +++ b/qpid/python/tests_0-10/query.py @@ -133,8 +133,20 @@ class QueryTests(TestBase010): #test exchange not found self.assertEqual(True, session.exchange_bound(exchange="unknown-exchange").exchange_not_found) - #test queue not found - self.assertEqual(True, session.exchange_bound(exchange=exchange_name, queue="unknown-queue").queue_not_found) + #test exchange found, queue not found + response = session.exchange_bound(exchange=exchange_name, queue="unknown-queue") + self.assertEqual(False, response.exchange_not_found) + self.assertEqual(True, response.queue_not_found) + + #test exchange not found, queue found + response = session.exchange_bound(exchange="unknown-exchange", queue="used-queue") + self.assertEqual(True, response.exchange_not_found) + self.assertEqual(False, response.queue_not_found) + + #test not exchange found, queue not found + response = session.exchange_bound(exchange="unknown-exchange", queue="unknown-queue") + self.assertEqual(True, response.exchange_not_found) + self.assertEqual(True, response.queue_not_found) def test_exchange_bound_fanout(self): |