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

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

Author: mark.little at jboss.com
Date: 2007-06-27 16:30:40 -0400 (Wed, 27 Jun 2007)
New Revision: 12899

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
Log:
http://jira.jboss.com/jira/browse/JBTM-243

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2007-06-27 20:17:46 UTC (rev 12898)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2007-06-27 20:30:40 UTC (rev 12899)
@@ -1823,9 +1823,6 @@
 		else
 			actionStatus = ActionStatus.COMMITTED;
 
-		//BasicAction.allActions.remove(get_uid());
-		ActionManager.manager().remove(get_uid());
-
 		boolean returnCurrentStatus = false;
 
 		if (reportHeuristics || (!reportHeuristics && !TxControl.asyncCommit))
@@ -2168,6 +2165,8 @@
 
 			updateState();
 
+			ActionManager.manager().remove(get_uid());
+			
 			criticalEnd();
 		}
 	}
@@ -2227,6 +2226,8 @@
 		updateState(); // we may end up saving more than the heuristic list
 					   // here!
 
+		ActionManager.manager().remove(get_uid());
+		
 		criticalEnd();
 		
 		/*
@@ -2730,6 +2731,8 @@
 
 		forgetHeuristics();
 
+		ActionManager.manager().remove(get_uid());
+		
 		criticalEnd();
 	}