[jboss-svn-commits] JBL Code SVN: r19239 - in labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP: atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca and 1 other directories.

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

Author: jhalliday
Date: 2008-03-26 09:04:14 -0400 (Wed, 26 Mar 2008)
New Revision: 19239

Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
Log:
Ported the fix for JBossWorkManager timeout handling from the SP branch to the CP branch. JBTM-274


Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2008-03-26 13:02:31 UTC (rev 19238)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2008-03-26 13:04:14 UTC (rev 19239)
@@ -350,7 +350,8 @@
 			 */
 
 			final long timeoutms = timeout * 1000;
-			if ((timeoutms < _checkPeriod) || (_checkPeriod == Long.MAX_VALUE))
+			
+			if (((timeoutms > 0) && (timeoutms < _checkPeriod)) || (_checkPeriod == Long.MAX_VALUE))
 			{
 				_checkPeriod = timeoutms; // convert to milliseconds!
 				notify();

Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2008-03-26 13:02:31 UTC (rev 19238)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2008-03-26 13:04:14 UTC (rev 19239)
@@ -101,7 +101,11 @@
 	{
 		try
 		{
-			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout);
+			/*
+			 * We expect the timeout to be in seconds, but it's milliseconds!
+			 */
+			
+			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout/1000);
 
 			switch (tx.getStatus())
 			{

Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2008-03-26 13:02:31 UTC (rev 19238)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2008-03-26 13:04:14 UTC (rev 19239)
@@ -98,7 +98,11 @@
 	{
 		try
 		{
-			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout);
+			/*
+			 * Remember to conver timeout to seconds.
+			 */
+			
+			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout/1000);
 
 			switch (tx.getStatus())
 			{