diff options
| author | Gordon Sim <gsim@apache.org> | 2008-05-28 13:55:06 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-05-28 13:55:06 +0000 |
| commit | 744d39a42e3c19bd247276388b08744bb6e73089 (patch) | |
| tree | 516c13369687cdc98980b23dd41fab3816fa88ac /qpid | |
| parent | 4227fe7613a91ee8817605044a3618d65bc23d76 (diff) | |
| download | qpid-python-744d39a42e3c19bd247276388b08744bb6e73089.tar.gz | |
QPID-1095: another error code correction
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@660952 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SemanticState.cpp | 2 | ||||
| -rw-r--r-- | qpid/python/tests_0-10/dtx.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp index 151d372ebb..3c4f6abc30 100644 --- a/qpid/cpp/src/qpid/broker/SemanticState.cpp +++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp @@ -161,7 +161,7 @@ void SemanticState::startDtx(const std::string& xid, DtxManager& mgr, bool join) void SemanticState::endDtx(const std::string& xid, bool fail) { if (!dtxBuffer) { - throw CommandInvalidException(QPID_MSG("xid " << xid << " not associated with this session")); + throw IllegalStateException(QPID_MSG("xid " << xid << " not associated with this session")); } if (dtxBuffer->getXid() != xid) { throw CommandInvalidException( diff --git a/qpid/python/tests_0-10/dtx.py b/qpid/python/tests_0-10/dtx.py index cea742b81c..796152794f 100644 --- a/qpid/python/tests_0-10/dtx.py +++ b/qpid/python/tests_0-10/dtx.py @@ -377,8 +377,7 @@ class DtxTests(TestBase010): session.dtx_end(xid=tx) self.fail("Attempted to end association with unknown xid, expected exception!") except SessionException, e: - #FYI: this is currently *not* the exception specified, but I think the spec is wrong! Confirming... - self.assertEquals(503, e.args[0].error_code) + self.assertEquals(409, e.args[0].error_code) def test_end(self): """ |