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

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

Author: kevin.conner at jboss.com
Date: 2006-07-25 05:56:42 -0400 (Tue, 25 Jul 2006)
New Revision: 5271

Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
   labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
Log:
Fixed timeout propagation

Modified: labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2006-07-24 21:54:56 UTC (rev 5270)
+++ labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2006-07-25 09:56:42 UTC (rev 5271)
@@ -145,8 +145,6 @@
 
 			if (_timeout > AtomicAction.NO_TIMEOUT)
 				TransactionReaper.transactionReaper(true).insert(this, _timeout);
-	
-			_timeout = timeout;
 		}
 
 		return status;

Modified: labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2006-07-24 21:54:56 UTC (rev 5270)
+++ labs/jbosstm/branches/JBOSSTS_4_2_GA_MP2/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2006-07-25 09:56:42 UTC (rev 5271)
@@ -166,7 +166,7 @@
     static TransactionStatusManager transactionStatusManager = null;
     static ClassName actionStoreType = null;
     static byte[]  xaNodeName = null;
-    static int _defaultTimeout = 60000; // 60 seconds
+    static int _defaultTimeout = 60; // 60 seconds
 
     static
     {
@@ -177,6 +177,7 @@
             try
             {
                 Integer in = new Integer(env);
+
                 _defaultTimeout = in.intValue();
             }
             catch (Exception ex)