Author: gsim
Date: Wed May 28 06:55:06 2008
New Revision: 660952
URL: http://svn.apache.org/viewvc?rev=660952&view=rev
Log:
QPID-1095: another error code correction
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=660952&r1=660951&r2=660952&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Wed May 28
06:55:06 2008
@@ -161,7 +161,7 @@
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(
Modified: incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py?rev=660952&r1=660951&r2=660952&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py (original)
+++ incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py Wed May 28 06:55:06 2008
@@ -377,8 +377,7 @@
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):
"""
