[jboss-svn-commits] JBL Code SVN: r33071 - labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna.

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

Author: mark.little at jboss.com
Date: 2010-05-25 07:58:19 -0400 (Tue, 25 May 2010)
New Revision: 33071

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
Log:
https://jira.jboss.org/browse/JBTM-742

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-05-25 11:08:10 UTC (rev 33070)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2010-05-25 11:58:19 UTC (rev 33071)
@@ -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
@@ -319,7 +302,7 @@
 	{
 		if (t != null)
 		{
-			ThreadActionData.purgeAction(this);
+			ThreadActionData.purgeAction(this, t);
 			return true;
 		}