[jboss-svn-commits] JBL Code SVN: r33328 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna.

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

Author: jhalliday
Date: 2010-06-03 05:52:12 -0400 (Thu, 03 Jun 2010)
New Revision: 33328

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
Log:
Backport AtomicAction ThreadActionData cleanup fix to the maintenance branch. JBTM-742


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-06-03 09:22:45 UTC (rev 33327)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-06-03 09:52:12 UTC (rev 33328)
@@ -82,23 +82,6 @@
 	}
 
 	/**
-	 * AtomicAction destructor. Under normal circumstances we do very little.
-	 * However there exists the possibility that this action is being deleted
-	 * while still running (user forgot to commit/abort) - in which case we do
-	 * an abort for him and mark all our parents as unable to commit.
-	 * Additionally due to scoping we may not be the current action - but in
-	 * that case the current action must be one of our nested actions so by
-	 * applying abort to it we should end up at ourselves!
-	 */
-
-	public void finalize ()
-	{
-		ThreadActionData.purgeAction(this);
-
-		super.finalize();
-	}
-
-	/**
 	 * Start the transaction running.
 	 * 
 	 * If the transaction is already running or has terminated, then an error
@@ -320,7 +303,7 @@
 	{
 		if (t != null)
 		{
-			ThreadActionData.purgeAction(this);
+			ThreadActionData.purgeAction(this, t);
 			return true;
 		}