Use the errata file for final 0-10 that has a type code for xids without which dtx.recover can't work.

Return the indoubt xids as an array of struct32s each of which contains an encoded xid.



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

1 files changed, 9 insertions, 9 deletions

diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp
index 8093c7c174..b7985e9ed8 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -452,12 +452,11 @@ void SessionAdapter::TxHandlerImpl::rollback()
 
 std::string SessionAdapter::DtxHandlerImpl::convert(const framing::Xid010& xid)
 {
-    std::stringstream out;
-    out << xid.getFormat() << xid.getGlobalId() << xid.getBranchId();
-    return out.str();
+    std::string encoded;
+    encode(xid, encoded);
+    return encoded;
 }
 
-
 void SessionAdapter::DtxHandlerImpl::select()
 {
     state.selectDtx();
@@ -543,13 +542,14 @@ Dtx010RecoverResult SessionAdapter::DtxHandlerImpl::recover()
 {
     std::set<std::string> xids;
     getBroker().getStore().collectPreparedXids(xids);        
-
-    //TODO: remove the need to copy from one container type to another
-    std::vector<std::string> data;
+    /*
+     * create array of long structs
+     */
+    Array indoubt(0xAB);
     for (std::set<std::string>::iterator i = xids.begin(); i != xids.end(); i++) {
-        data.push_back(*i);
+        boost::shared_ptr<FieldValue> xid(new Struct32Value(*i));
+        indoubt.add(xid);
     }
-    Array indoubt(data);
     return Dtx010RecoverResult(indoubt);
 }