[jboss-svn-commits] JBL Code SVN: r9081 - labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca.

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

Author: mark.little at jboss.com
Date: 2007-01-29 16:43:52 -0500 (Mon, 29 Jan 2007)
New Revision: 9081

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxImporter.java
Log:
Added recovery support.

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxImporter.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxImporter.java	2007-01-29 20:46:44 UTC (rev 9080)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/TxImporter.java	2007-01-29 21:43:52 UTC (rev 9081)
@@ -31,11 +31,11 @@
 
 package com.arjuna.ats.internal.jta.transaction.arjunacore.jca;
 
-import java.security.InvalidParameterException;
 import java.util.HashMap;
 
 import javax.transaction.xa.*;
 
+import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.jca.TransactionImple;
 
 public class TxImporter
@@ -73,7 +73,7 @@
 	public static TransactionImple importTransaction (Xid xid, int timeout) throws XAException
 	{
 		if (xid == null)
-			throw new InvalidParameterException();
+			throw new IllegalArgumentException();
 		
 		/*
 		 * Check to see if we haven't already imported this thing.
@@ -92,6 +92,42 @@
 	}
 	
 	/**
+	 * Used to recover an imported transaction.
+	 * 
+	 * @param actId the state to recover.
+	 * @return the recovered transaction object.
+	 * @throws XAException
+	 */
+	
+	public static TransactionImple recoverTransaction (Uid actId) throws XAException
+	{
+		if (actId == null)
+			throw new IllegalArgumentException();
+		
+		TransactionImple recovered = new TransactionImple(actId);
+
+		/*
+		 * Is the transaction already in the list? This may be the case
+		 * because we scan the object store periodically and may get Uids to
+		 * recover for transactions that are progressing normally, i.e., do
+		 * not need recovery. In which case, we need to ignore them.
+		 */
+		
+		TransactionImple tx = (TransactionImple) _transactions.get(recovered.baseXid());
+		
+		if (tx == null)
+		{
+			_transactions.put(recovered.baseXid(), recovered);
+		
+			recovered.recordTransaction();
+			
+			return recovered;
+		}
+		else
+			return tx;
+	}
+	
+	/**
 	 * Get the subordinate (imported) transaction associated with the
 	 * global transaction.
 	 * 
@@ -106,7 +142,7 @@
 	public static TransactionImple getImportedTransaction (Xid xid) throws XAException
 	{
 		if (xid == null)
-			throw new InvalidParameterException();
+			throw new IllegalArgumentException();
 		
 		return (TransactionImple) _transactions.get(xid);
 	}
@@ -122,7 +158,7 @@
 	public static void removeImportedTransaction (Xid xid) throws XAException
 	{
 		if (xid == null)
-			throw new InvalidParameterException();
+			throw new IllegalArgumentException();
 		
 		_transactions.remove(xid);
 	}