diff options
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.cpp | 2 | ||||
| -rw-r--r-- | python/tests_0-10/dtx.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index 151d372ebb..3c4f6abc30 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/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/python/tests_0-10/dtx.py b/python/tests_0-10/dtx.py index cea742b81c..796152794f 100644 --- a/python/tests_0-10/dtx.py +++ b/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): """ |