[jboss-svn-commits] JBL Code SVN: r6411 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific

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

Author: kevin.conner at jboss.com
Date: 2006-09-25 07:12:17 -0400 (Mon, 25 Sep 2006)
New Revision: 6411

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/SubordinateAtomicTransaction.java
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
Log:
Proctect the reaper from invalid transaction timeout values for JBTM-130

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2006-09-25 10:43:31 UTC (rev 6410)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2006-09-25 11:12:17 UTC (rev 6411)
@@ -143,7 +143,7 @@
 			if (_timeout == 0)
 				_timeout = TxControl.getDefaultTimeout();
 			
-			if (_timeout > AtomicAction.NO_TIMEOUT)
+			if (_timeout > 0)
 				TransactionReaper.transactionReaper(true).insert(this, _timeout);
 		}
 

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java	2006-09-25 10:43:31 UTC (rev 6410)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/BaseTransaction.java	2006-09-25 11:12:17 UTC (rev 6411)
@@ -213,8 +213,11 @@
 	public void setTransactionTimeout(int seconds)
 			throws javax.transaction.SystemException
 	{
-        final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
-		_timeouts.put(threadId, new Integer(seconds));
+		if (seconds >= 0)
+		{
+	        final String threadId = Integer.toHexString(System.identityHashCode(Thread.currentThread())) ;
+			_timeouts.put(threadId, new Integer(seconds));
+		}
 	}
 
 	public int getTimeout() throws javax.transaction.SystemException

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/SubordinateAtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/SubordinateAtomicTransaction.java	2006-09-25 10:43:31 UTC (rev 6410)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/jca/SubordinateAtomicTransaction.java	2006-09-25 11:12:17 UTC (rev 6411)
@@ -52,7 +52,7 @@
 		
 		// add this transaction to the reaper list.
 		
-		if (timeout != 0)
+		if (timeout > 0)
 		{
 			TransactionReaper reaper = TransactionReaper.transactionReaper(true);
 			

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java	2006-09-25 10:43:31 UTC (rev 6410)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/TransactionFactoryImple.java	2006-09-25 11:12:17 UTC (rev 6411)
@@ -179,7 +179,7 @@
 			if (theTimeout == 0)
 				theTimeout = TransactionFactoryImple._defaultTimeout;
 
-			if (theTimeout != 0)
+			if (theTimeout > 0)
 			{
 				/*
 				 * Currently we do not remove controls from the list once they