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

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

Author: jhalliday
Date: 2009-05-29 05:21:45 -0400 (Fri, 29 May 2009)
New Revision: 26771

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
Log:
Backport tx timeout of setRollbackOnly tx fix from trunk to 4.6.1.CP branch. JBTM-563


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2009-05-29 09:18:08 UTC (rev 26770)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2009-05-29 09:21:45 UTC (rev 26771)
@@ -174,7 +174,7 @@
 
 	public boolean running ()
 	{
-		return (boolean) (status() == ActionStatus.RUNNING);
+		return (status() == ActionStatus.RUNNING || status() == ActionStatus.ABORT_ONLY);
 	}
 
 	/**