[jboss-svn-commits] JBL Code SVN: r36582 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts: recovery/transactions and 1 other directory.

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

Author: jhalliday
Date: 2011-01-27 05:21:20 -0500 (Thu, 27 Jan 2011)
New Revision: 36582

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
Log:
Prevent recovered JTS subordinates from usurping the Id of their parent. JBTM-818


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java	2011-01-27 10:17:48 UTC (rev 36581)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java	2011-01-27 10:21:20 UTC (rev 36582)
@@ -657,7 +657,7 @@
 					+ recoveringActUid + " )");
 		}
 
-		_savingUid = recoveringActUid;
+		_savingUid = new Uid(recoveringActUid);
 		_sync = null;
 		_beforeCompleted = false;
 		_recoveryCoordinator = null;

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java	2011-01-27 10:17:48 UTC (rev 36581)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredServerTransaction.java	2011-01-27 10:21:20 UTC (rev 36582)
@@ -502,7 +502,9 @@
 			     Uid processUid) throws IOException
     {
 	_originalProcessUid = new Uid(Uid.nullUid());
-	super.unpackHeader(os, super.objectUid, _originalProcessUid);
+    // caution: override the process id only, not the object id. JBTM-818
+    Uid dummyUid = new Uid(Uid.nullUid());
+    super.unpackHeader(os, dummyUid, _originalProcessUid);
 
 	if (jtsLogger.loggerI18N.isDebugEnabled())
 	{