[jboss-svn-commits] JBL Code SVN: r31470 - 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: 2010-02-06 11:27:16 -0500 (Sat, 06 Feb 2010)
New Revision: 31470

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
Log:
Improved warning messages.

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	2010-02-06 16:25:19 UTC (rev 31469)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2010-02-06 16:27:16 UTC (rev 31470)
@@ -73,7 +73,10 @@
  *          still running action id {0} invoked - Aborting
  * @message com.arjuna.ats.arjuna.coordinator.BasicAction_5
  *          [com.arjuna.ats.arjuna.coordinator.BasicAction_5] - Activate of
- *          atomic action with id {0} and type {1} unexpectedly failed
+ *          atomic action with id {0} and type {1} unexpectedly failed, could not load state.
+ * @message com.arjuna.ats.arjuna.coordinator.BasicAction_5a
+ *          [com.arjuna.ats.arjuna.coordinator.BasicAction_5a] - Deactivate of
+ *          atomic action with id {0} and type {1} unexpectedly failed, could not save state.
  * @message com.arjuna.ats.arjuna.coordinator.BasicAction_6
  *          [com.arjuna.ats.arjuna.coordinator.BasicAction_6] -
  *          BasicAction::addChildThread () action {0} adding {1}
@@ -818,7 +821,7 @@
 			{
 				if (tsLogger.arjLoggerI18N.isWarnEnabled())
 				{
-					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5", new Object[]
+					tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_5a", new Object[]
 					{ get_uid(), type() });
 				}
 			}
@@ -1559,7 +1562,7 @@
 			heuristicDecision = tempHeuristicDecision;
 			savedIntentionList = true;
 		}
-
+		
 		return res;
 	}
 
@@ -3568,11 +3571,14 @@
 
 			/*
 			 * If we have failures then rewrite the intentions list. Otherwise,
-			 * delete the log entry.
+			 * delete the log entry. Depending upon how we get here the intentions
+			 * list will either be in the preparedList or the failedList. Fortunately
+			 * save_state will figure out which one to use.
 			 */
 
 			if (((failedList != null) && (failedList.size() > 0))
-					|| ((heuristicList != null) && (heuristicList.size() > 0)))
+					|| ((heuristicList != null) && (heuristicList.size() > 0))
+					|| ((preparedList != null) && (preparedList.size() > 0)))
 			{
 				/*
 				 * Re-write the BasicAction record with the failed list