[jboss-svn-commits] JBL Code SVN: r13994 - in labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx: jts/jca and 1 other directory.

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

Author: jhalliday
Date: 2007-08-03 08:48:21 -0400 (Fri, 03 Aug 2007)
New Revision: 13994

Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
Log:
Merged fix for http://jira.jboss.com/jira/browse/JBTM-274 to the SP branch.


Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2007-08-03 12:40:38 UTC (rev 13993)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java	2007-08-03 12:48:21 UTC (rev 13994)
@@ -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_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2007-08-03 12:40:38 UTC (rev 13993)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_SP/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java	2007-08-03 12:48:21 UTC (rev 13994)
@@ -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())
 			{