[jboss-svn-commits] JBL Code SVN: r13978 - 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
jboss-svn-commits at lists.jboss.org
Fri Aug 3 04:28:34 EDT 2007
Author: mark.little at jboss.com
Date: 2007-08-03 04:28:34 -0400 (Fri, 03 Aug 2007)
New Revision: 13978
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:
http://jira.jboss.com/jira/browse/JBTM-274
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 02:40:06 UTC (rev 13977)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TransactionReaper.java 2007-08-03 08:28:34 UTC (rev 13978)
@@ -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/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 02:40:06 UTC (rev 13977)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2007-08-03 08:28:34 UTC (rev 13978)
@@ -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/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 02:40:06 UTC (rev 13977)
+++ labs/jbosstm/tags/JBOSSTS_4_2_3_SP5/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2007-08-03 08:28:34 UTC (rev 13978)
@@ -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())
{
More information about the jboss-svn-commits
mailing list