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

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

Author: jhalliday
Date: 2007-08-03 08:53:42 -0400 (Fri, 03 Aug 2007)
New Revision: 13995

Modified:
   labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
   labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
   labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
Log:
reverted changes from http://jira.jboss.com/jira/browse/JBTM-274 that were incorrectly put into SP5 tag rather than SP branch.
The SP5 tag should now once again be equiv to r12650, the r13978 changes having been cancelled out.


Modified: labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java
===================================================================
--- labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2007-08-03 12:48:21 UTC (rev 13994)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java	2007-08-03 12:53:42 UTC (rev 13995)
@@ -350,8 +350,7 @@
 			 */
 
 			final long timeoutms = timeout * 1000;
-			
-			if (((timeoutms > 0) && (timeoutms < _checkPeriod)) || (_checkPeriod == Long.MAX_VALUE))
+			if ((timeoutms < _checkPeriod) || (_checkPeriod == Long.MAX_VALUE))
 			{
 				_checkPeriod = timeoutms; // convert to milliseconds!
 				notify();

Modified: labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
===================================================================
--- labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2007-08-03 12:48:21 UTC (rev 13994)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2007-08-03 12:53:42 UTC (rev 13995)
@@ -101,11 +101,7 @@
 	{
 		try
 		{
-			/*
-			 * We expect the timeout to be in seconds, but it's milliseconds!
-			 */
-			
-			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout/1000);
+			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout);
 
 			switch (tx.getStatus())
 			{

Modified: labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
===================================================================
--- labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2007-08-03 12:48:21 UTC (rev 13994)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2007-08-03 12:53:42 UTC (rev 13995)
@@ -98,11 +98,7 @@
 	{
 		try
 		{
-			/*
-			 * Remember to conver timeout to seconds.
-			 */
-			
-			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout/1000);
+			TransactionImple tx = TxImporter.importTransaction(xid, (int) timeout);
 
 			switch (tx.getStatus())
 			{