[jboss-cvs] JBoss Messaging SVN: r1659 - branches/Branch_1_0_XARecovery/src/main/org/jboss/messaging/core/tx

[jboss-cvs-commits at lists.jboss.org]

Author: juha at jboss.org
Date: 2006-11-29 21:08:03 -0500 (Wed, 29 Nov 2006)
New Revision: 1659

Modified:
   branches/Branch_1_0_XARecovery/src/main/org/jboss/messaging/core/tx/TransactionRepository.java
Log:
rollback the xid recreation from original patch (JBMESSAGING-407)

Modified: branches/Branch_1_0_XARecovery/src/main/org/jboss/messaging/core/tx/TransactionRepository.java
===================================================================
--- branches/Branch_1_0_XARecovery/src/main/org/jboss/messaging/core/tx/TransactionRepository.java	2006-11-30 02:05:47 UTC (rev 1658)
+++ branches/Branch_1_0_XARecovery/src/main/org/jboss/messaging/core/tx/TransactionRepository.java	2006-11-30 02:08:03 UTC (rev 1659)
@@ -151,7 +151,7 @@
 				// // we have to associate a callback to the prepared
 				// transaction
 				// // --MK
-				 persistenceManager.associateTxCallbackToPreparedTx(tx);
+				persistenceManager.associateTxCallbackToPreparedTx(tx);
 				// log.info(">>>ASSOCIATING THE MEMCALLBACK <<<");
 
             // TODO: [JPL] needs to be completed.
@@ -169,11 +169,15 @@
 		// the incoming Xid from Arjuna's RM is funny formatted!
 		// hence we have to do our way
 		// I have to look into this carefully a bit later.
+      //
+		//Xid x = new XidImpl(xid.getBranchQualifier(), xid.getFormatId(), xid
+		//		.getGlobalTransactionId());
+      //
+      //Transaction tx = (Transaction)globalToLocalMap.get(x);
 
-		Xid x = new XidImpl(xid.getBranchQualifier(), xid.getFormatId(), xid
-				.getGlobalTransactionId());
+      // TODO: do we really need to recreate the xid instance and why? [JPL]
 
-      Transaction tx = (Transaction)globalToLocalMap.get(x);
+      Transaction tx = (Transaction)globalToLocalMap.get(xid);
 
       if (tx == null)
       {