[jboss-svn-commits] JBL Code SVN: r26942 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore and 1 other directory.

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

Author: jhalliday
Date: 2009-06-12 06:43:52 -0400 (Fri, 12 Jun 2009)
New Revision: 26942

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java
Log:
Improvements to Syncronization error handling. JBTM-257


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2009-06-12 10:37:22 UTC (rev 26941)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TwoPhaseCoordinator.java	2009-06-12 10:43:52 UTC (rev 26942)
@@ -389,13 +389,13 @@
 						catch (Exception ex)
 						{
 							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4a", new Object[]
-							{ record, ex });
+							{ record, ex }, ex);
 							problem = true;
 						}
 						catch (Error er)
 						{
 							tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator_4b", new Object[]
-							{ record, er });
+							{ record, er }, er);
 							problem = true;
 						}
 					}

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java	2009-06-12 10:37:22 UTC (rev 26941)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/SynchronizationImple.java	2009-06-12 10:43:52 UTC (rev 26942)
@@ -106,31 +106,37 @@
 	    return false;
     }
 
+    /**
+     * @message com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple SynchronizationImple.afterCompletion - failed for {0} with exception {1}
+     */
     public boolean afterCompletion (int status)
     {
-	if (jtaLogger.logger.isDebugEnabled())
-	{
-	    jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
-				  "SynchronizationImple.afterCompletion");
-	}
+        if (jtaLogger.logger.isDebugEnabled())
+        {
+            jtaLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
+                    "SynchronizationImple.afterCompletion");
+        }
 
-	if (_theSynch != null)
-	{
-	    int s = StatusConverter.convert(status);
+        if (_theSynch != null)
+        {
+            int s = StatusConverter.convert(status);
 
-	    try
-	    {
-		_theSynch.afterCompletion(s);
+            try
+            {
+                _theSynch.afterCompletion(s);
 
-		return true;
-	    }
-	    catch (Exception e)
-	    {
-		return false; // should not cause any affect!
-	    }
-	}
-	else
-	    return false; // should not cause any affect!
+                return true;
+            }
+            catch (Exception e)
+            {
+                jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple",
+                        new Object[] { _theSynch, e }, e);
+
+                return false; // should not cause any affect!
+            }
+        }
+        else
+            return false; // should not cause any affect!
     }
 
 	/*