[jboss-svn-commits] JBL Code SVN: r37846 - in labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats: jts/logging and 1 other directory.

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

Author: tomjenkinson
Date: 2012-01-17 10:15:39 -0500 (Tue, 17 Jan 2012)
New Revision: 37846

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
Log:
JBTM-1021

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java	2012-01-16 09:16:13 UTC (rev 37845)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java	2012-01-17 15:15:39 UTC (rev 37846)
@@ -517,8 +517,11 @@
 		{
 			return TwoPhaseOutcome.HEURISTIC_HAZARD;
 		}
-		catch (SystemException e5) {
-            jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelCommit", e5);
+        catch (OBJECT_NOT_EXIST e5) {
+            jtsLogger.i18NLogger.warn_1pc_commit_one();
+        }
+		catch (SystemException e6) {
+            jtsLogger.i18NLogger.warn_resources_errgenerr("ExtendedResourceRecord.topLevelCommit", e6);
 
             return TwoPhaseOutcome.FINISH_ERROR;
         }

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java	2012-01-16 09:16:13 UTC (rev 37845)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java	2012-01-17 15:15:39 UTC (rev 37846)
@@ -1044,6 +1044,10 @@
     @LogMessage(level = WARN)
     public void warn_orbspecific_coordinator_ipunknown(String arg0, String arg1);
 
+    @Message(id = 22259, value = "ExtendedResourceRecord detected that the remote side had cleaned up, assuming 1PC resource", format = MESSAGE_FORMAT)
+    @LogMessage(level = WARN)
+    public void warn_1pc_commit_one();
+
     /*
         Allocate new messages directly above this notice.
           - id: use the next id number in sequence. Don't reuse ids.