diff options
| author | Gordon Sim <gsim@apache.org> | 2007-09-03 09:15:35 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-09-03 09:15:35 +0000 |
| commit | 24da8ddb4a9f865fd6f0f192b1ff8d83816dd641 (patch) | |
| tree | 50f0b9371df8d84e8c34c3c825896214e67e1afc | |
| parent | d3f67fce93fa8548456d81c1f5d548df630e0f5b (diff) | |
| download | qpid-python-24da8ddb4a9f865fd6f0f192b1ff8d83816dd641.tar.gz | |
Fix for QPID-561
Renabled MessageBuilderTest
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@572264 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp | 10 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | qpid/python/tests_0-10/dtx.py | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp b/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp index e07fdf80bf..15ece77c6f 100644 --- a/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp +++ b/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp @@ -20,20 +20,12 @@ #include <boost/format.hpp> #include "Broker.h" #include "Session.h" +#include "qpid/framing/constants.h" using namespace qpid::broker; using namespace qpid::framing; using std::string; -const int XA_RBROLLBACK(1); -const int XA_RBTIMEOUT(2); -const int XA_HEURHAZ(3); -const int XA_HEURCOM(4); -const int XA_HEURRB(5); -const int XA_HEURMIX(6); -const int XA_RDONLY(7); -const int XA_OK(8); - DtxHandlerImpl::DtxHandlerImpl(CoreRefs& parent) : CoreRefs(parent) {} // DtxDemarcationHandler: diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 9d3d86b091..874a9a448a 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -93,8 +93,8 @@ broker_unit_tests = \ TxBufferTest \ TxPublishTest \ ValueTest \ - MessageHandlerTest -# MessageBuilderTest + MessageHandlerTest \ + MessageBuilderTest #client_unit_tests = \ ClientChannelTest diff --git a/qpid/python/tests_0-10/dtx.py b/qpid/python/tests_0-10/dtx.py index ea587f5998..29a4d3bf0d 100644 --- a/qpid/python/tests_0-10/dtx.py +++ b/qpid/python/tests_0-10/dtx.py @@ -39,7 +39,7 @@ class DtxTests(TestBase): XA_RBROLLBACK = 1 XA_RBTIMEOUT = 2 - XA_OK = 8 + XA_OK = 0 tx_counter = 0 def reset_channel(self): |