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

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

Author: jhalliday
Date: 2010-07-22 09:43:41 -0400 (Thu, 22 Jul 2010)
New Revision: 34112

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java
Log:
backport fix for ThreadActionData.currentAction branch logic. JBTM-760


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java	2010-07-22 13:09:29 UTC (rev 34111)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/thread/ThreadActionData.java	2010-07-22 13:43:41 UTC (rev 34112)
@@ -58,15 +58,9 @@
 		ThreadActionData.setup();
 		Stack txs = (Stack) _threadList.get();
 
-		if (txs != null)
+		if (txs != null && !txs.isEmpty())
 		{
-			try
-			{
-				return (BasicAction) txs.peek();
-			}
-			catch (EmptyStackException e)
-			{
-			}
+			return (BasicAction) txs.peek();
 		}
 
 		return null;