diff options
| author | Gordon Sim <gsim@apache.org> | 2011-02-25 17:10:05 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-02-25 17:10:05 +0000 |
| commit | ff841dac2d711d55b1e5edeffbe7471a8d04fb95 (patch) | |
| tree | b89425dd8f0e4b99f4392d7ce13d2f9ca486b255 | |
| parent | 667818f1417c742bc4c49465ef83562a693f0e49 (diff) | |
| download | qpid-python-ff841dac2d711d55b1e5edeffbe7471a8d04fb95.tar.gz | |
QPID-2326: correct exception code for unknown exchange type
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1074634 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SessionAdapter.cpp | 2 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp index 9e4516679e..b95bb196fd 100644 --- a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp @@ -114,7 +114,7 @@ void SessionAdapter::ExchangeHandlerImpl::declare(const string& exchange, const "existing")); } }catch(UnknownExchangeTypeException& /*e*/){ - throw CommandInvalidException(QPID_MSG("Exchange type not implemented: " << type)); + throw NotFoundException(QPID_MSG("Exchange type not implemented: " << type)); } } } diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py index 9a4cfd37d6..f51923fcf3 100644 --- a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py +++ b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py @@ -448,9 +448,9 @@ class MiscellaneousErrorsTests(TestHelper): def testTypeNotKnown(self): try: self.session.exchange_declare(exchange="test_type_not_known_exchange", type="invalid_type") - self.fail("Expected 503 for declaration of unknown exchange type.") + self.fail("Expected 404 for declaration of unknown exchange type.") except SessionException, e: - self.assertEquals(503, e.args[0].error_code) + self.assertEquals(404, e.args[0].error_code) def testDifferentDeclaredType(self): self.exchange_declare(exchange="test_different_declared_type_exchange", type="direct") |