Updates to dtx support.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@543182 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/BrokerChannel.cpp b/cpp/src/qpid/broker/BrokerChannel.cpp
index 235f320cb7..096478faad 100644
--- a/cpp/src/qpid/broker/BrokerChannel.cpp
+++ b/cpp/src/qpid/broker/BrokerChannel.cpp
@@ -28,17 +28,19 @@
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
 
-#include "BrokerChannel.h"
 #include "qpid/framing/ChannelAdapter.h"
 #include "qpid/QpidError.h"
-#include "DeliverableMessage.h"
-#include "BrokerQueue.h"
+
+#include "BrokerAdapter.h"
+#include "BrokerChannel.h"
 #include "BrokerMessage.h"
+#include "BrokerQueue.h"
+#include "Connection.h"
+#include "DeliverableMessage.h"
+#include "DtxAck.h"
 #include "MessageStore.h"
 #include "TxAck.h"
 #include "TxPublish.h"
-#include "BrokerAdapter.h"
-#include "Connection.h"
 
 using std::mem_fun_ref;
 using std::bind2nd;
@@ -133,7 +135,8 @@ void Channel::endDtx(const std::string& xid){
                                   % dtxBuffer->getXid() % xid);
     }
 
-    TxOp::shared_ptr txAck(new TxAck(accumulatedAck, unacked));
+    TxOp::shared_ptr txAck(new DtxAck(accumulatedAck, unacked));
+    accumulatedAck.clear();
     dtxBuffer->enlist(txAck);    
     dtxBuffer->markEnded();