[jboss-svn-commits] JBL Code SVN: r5171 - in labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna: . common coordinator

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

Author: mark.little at jboss.com
Date: 2006-07-19 08:50:30 -0400 (Wed, 19 Jul 2006)
New Revision: 5171

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
Log:
Added default timeout for basic action structure.

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-07-19 09:27:55 UTC (rev 5170)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/AtomicAction.java	2006-07-19 12:50:30 UTC (rev 5171)
@@ -55,7 +55,7 @@
 public class AtomicAction extends TwoPhaseCoordinator
 {
 
-	public static final int NO_TIMEOUT = 0;
+	public static final int NO_TIMEOUT = -1;
 	
 	/**
 	 * Create a new transaction. If there is already a transaction associated
@@ -140,6 +140,9 @@
 
 			_timeout = timeout;
 	
+			if (_timeout == 0)
+				_timeout = TxControl.getDefaultTimeout();
+			
 			if (_timeout > AtomicAction.NO_TIMEOUT)
 				TransactionReaper.transactionReaper(true).insert(this, _timeout);
 	

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java	2006-07-19 09:27:55 UTC (rev 5170)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java	2006-07-19 12:50:30 UTC (rev 5171)
@@ -79,6 +79,7 @@
  * <li> OBJECTSTORE_HIERARCHY_TIMEOUT = com.arjuna.ats.arjuna.objectstore.hierarchyTimeout
  * <li> RECOVERY_MANAGER_PORT = com.arjuna.ats.internal.arjuna.recovery.recoveryPort
  * <li> XA_NODE_IDENTIFIER = com.arjuna.ats.arjuna.xa.nodeIdentifier
+ * <li> DEFAULT_TIMEOUT = com.arjuna.ats.arjuna.coordinator.defaultTimeout
  * </ul>
  *
  * @author Mark Little (mark at arjuna.com)
@@ -132,6 +133,7 @@
     public static final String OBJECTSTORE_HIERARCHY_TIMEOUT = "com.arjuna.ats.arjuna.objectstore.hierarchyTimeout";
     public static final String RECOVERY_MANAGER_PORT = "com.arjuna.ats.internal.arjuna.recovery.recoveryPort";
     public static final String XA_NODE_IDENTIFIER = "com.arjuna.ats.arjuna.xa.nodeIdentifier";
+    public static final String DEFAULT_TIMEOUT = "com.arjuna.ats.arjuna.coordinator.defaultTimeout";
     
 }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2006-07-19 09:27:55 UTC (rev 5170)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java	2006-07-19 12:50:30 UTC (rev 5171)
@@ -56,6 +56,16 @@
 public class TxControl
 {
 
+	public static final int getDefaultTimeout ()
+	{
+		return _defaultTimeout;
+	}
+	
+	public static final void setDefaultTimeout (int timeout)
+	{
+		_defaultTimeout = timeout;
+	}
+	
     public static final void enable ()
     {
 	TxControl.enable = true;
@@ -156,9 +166,26 @@
     static TransactionStatusManager transactionStatusManager = null;
     static ClassName actionStoreType = null;
     static byte[]  xaNodeName = null;
+    static int _defaultTimeout = 60000; // 60 seconds
 
     static
     {
+    	String env = arjPropertyManager.propertyManager.getProperty(Environment.DEFAULT_TIMEOUT);
+    	
+    	if (env != null)
+    	{
+    		try
+    		{
+    			Integer in = new Integer(env);
+    			
+    			_defaultTimeout = in.intValue();
+    		}
+    		catch (Exception ex)
+    		{
+    			ex.printStackTrace();
+    		}
+    	}
+    	
 	String env = arjPropertyManager.propertyManager.getProperty(Environment.MAINTAIN_HEURISTICS);
 	
 	if (env != null)