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

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

Author: mark.little at jboss.com
Date: 2009-07-09 14:13:40 -0400 (Thu, 09 Jul 2009)
New Revision: 27796

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
Log:
minor fix for warning message (prevent NPE).

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2009-07-09 18:12:32 UTC (rev 27795)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2009-07-09 18:13:40 UTC (rev 27796)
@@ -286,6 +286,8 @@
  * @message com.arjuna.ats.arjuna.coordinator.cafactoryerror
  *          [com.arjuna.ats.arjuna.coordinator.cafactoryerror] - Cannot continue due to
  *          CheckedActionFactory resolution problem with
+ * @message com.arjuna.ats.arjuna.coordinator.notrunning
+ *          [com.arjuna.ats.arjuna.coordinator.notrunning] - Cannot begin new transaction as TM is disabled. Marking as rollback-only.
  */
 
 public class BasicAction extends StateManager
@@ -1664,51 +1666,67 @@
 					+ get_uid());
 		}
 		
-		if (actionStatus != ActionStatus.CREATED)
+		if (!TxControl.isEnabled())
 		{
-			if (tsLogger.arjLoggerI18N.isWarnEnabled())
-			{
-				tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_29", new Object[]
-				{ get_uid(), ActionStatus.stringForm(actionStatus) });
-			}
+		    /*
+		     * Prevent transaction from making forward progress.
+		     */
+		    
+		    actionStatus = ActionStatus.ABORT_ONLY;
+		    
+		    if (tsLogger.arjLoggerI18N.isWarnEnabled())
+                    {
+                            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.notrunning");
+                    }
 		}
 		else
-		{
-			actionInitialise(parentAct);
-			actionStatus = ActionStatus.RUNNING;
+		{   
+		    if (actionStatus != ActionStatus.CREATED)
+		    {
+		        if (tsLogger.arjLoggerI18N.isWarnEnabled())
+		        {
+		            tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_29", new Object[]
+		                                                                                                       { get_uid(), ActionStatus.stringForm(actionStatus) });
+		        }
+		    }
+		    else
+		    {
+		        actionInitialise(parentAct);
+		        actionStatus = ActionStatus.RUNNING;
 
-			if ((actionType != ActionType.TOP_LEVEL)
-					&& ((parentAct == null) || (parentAct.status() > ActionStatus.RUNNING)))
-			{
-				actionStatus = ActionStatus.ABORT_ONLY;
+		        if ((actionType != ActionType.TOP_LEVEL)
+		                && ((parentAct == null) || (parentAct.status() > ActionStatus.RUNNING)))
+		        {
+		            actionStatus = ActionStatus.ABORT_ONLY;
 
-				if (parentAct == null)
-				{
-					if (tsLogger.arjLoggerI18N.isWarnEnabled())
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_30", new Object[]
-						{ get_uid() });
-					}
-				}
-				else
-				{
-					if (tsLogger.arjLoggerI18N.debugAllowed())
-					{
-						tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_31", new Object[]
-						{ get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()) });
-					}
-				}
-			}
+		            if (parentAct == null)
+		            {
+		                if (tsLogger.arjLoggerI18N.isWarnEnabled())
+		                {
+		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_30", new Object[]
+		                                                                                                               { get_uid() });
+		                }
+		            }
+		            else
+		            {
+		                if (tsLogger.arjLoggerI18N.debugAllowed())
+		                {
+		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_31", new Object[]
+		                                                                                                               { get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()) });
+		                }
+		            }
+		        }
 
-			ActionManager.manager().put(this);
+		        ActionManager.manager().put(this);
 
-			if (TxControl.enableStatistics)
-			{
-				TxStats.incrementTransactions();
+		        if (TxControl.enableStatistics)
+		        {
+		            TxStats.incrementTransactions();
 
-				if (parentAct != null)
-					TxStats.incrementNestedTransactions();
-			}
+		            if (parentAct != null)
+		                TxStats.incrementNestedTransactions();
+		        }
+		    }
 		}
 
 		return actionStatus;
@@ -3732,7 +3750,7 @@
 				if (tsLogger.arjLoggerI18N.isWarnEnabled())
 				{
 					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_62", new Object[]
-					{ child.get_uid() });
+					{ ((child != null ? child.get_uid() : "null"))});
 				}
 			}
 		}