[jboss-svn-commits] JBL Code SVN: r31472 - 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: 2010-02-06 11:32:20 -0500 (Sat, 06 Feb 2010)
New Revision: 31472

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

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2010-02-06 16:28:25 UTC (rev 31471)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2010-02-06 16:32:20 UTC (rev 31472)
@@ -71,7 +71,10 @@
 	public int start (BasicAction parentAction)
 	{
 		if (parentAction != null)
+		{
+		    if (typeOfAction() == ActionType.NESTED)
 			parentAction.addChildAction(this);
+		}
 
 		return super.Begin(parentAction);
 	}
@@ -81,7 +84,9 @@
 		int outcome;
 
 		if (parent() != null)
-			parent().removeChildAction(this);
+		{
+		    parent().removeChildAction(this);
+		}
 
         boolean canEnd = true;
         if(status() != ActionStatus.ABORT_ONLY || TxControl.isBeforeCompletionWhenRollbackOnly())