You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2007/09/03 11:15:36 UTC
svn commit: r572264 - in /incubator/qpid/trunk/qpid:
cpp/src/qpid/broker/DtxHandlerImpl.cpp cpp/src/tests/Makefile.am
python/tests_0-10/dtx.py
Author: gsim
Date: Mon Sep 3 02:15:35 2007
New Revision: 572264
URL: http://svn.apache.org/viewvc?rev=572264&view=rev
Log:
Fix for QPID-561
Renabled MessageBuilderTest
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp?rev=572264&r1=572263&r2=572264&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.cpp Mon Sep 3 02:15:35 2007
@@ -20,19 +20,11 @@
#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) {}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=572264&r1=572263&r2=572264&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon Sep 3 02:15:35 2007
@@ -93,8 +93,8 @@
TxBufferTest \
TxPublishTest \
ValueTest \
- MessageHandlerTest
-# MessageBuilderTest
+ MessageHandlerTest \
+ MessageBuilderTest
#client_unit_tests = \
ClientChannelTest
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=572264&r1=572263&r2=572264&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py (original)
+++ incubator/qpid/trunk/qpid/python/tests_0-10/dtx.py Mon Sep 3 02:15:35 2007
@@ -39,7 +39,7 @@
XA_RBROLLBACK = 1
XA_RBTIMEOUT = 2
- XA_OK = 8
+ XA_OK = 0
tx_counter = 0
def reset_channel(self):