[jboss-svn-commits] JBL Code SVN: r8917 - in labs/jbosstm/trunk: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2007-01-19 05:45:30 -0500 (Fri, 19 Jan 2007)
New Revision: 8917

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
Log:


Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2007-01-19 10:34:16 UTC (rev 8916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2007-01-19 10:45:30 UTC (rev 8917)
@@ -534,8 +534,9 @@
 						case XAException.XAER_NOTA:
 						case XAException.XAER_PROTO:
 							break;
+						case XAException.XA_RETRY:
+							return TwoPhaseOutcome.FINISH_ERROR;
 						case XAException.XAER_INVAL:
-						case XAException.XA_RETRY:
 						case XAException.XAER_RMFAIL: // resource manager
 													  // failed, did it
 													  // rollback?
@@ -650,7 +651,6 @@
 
 					switch (e1.errorCode)
 					{
-					case XAException.XAER_RMERR:
 					case XAException.XA_HEURHAZ:
 					case XAException.XA_HEURMIX:
 						return TwoPhaseOutcome.HEURISTIC_HAZARD;
@@ -658,6 +658,15 @@
 						forget() ;
 						break;
 					case XAException.XA_HEURRB:
+					case XAException.XA_RBROLLBACK:
+					case XAException.XA_RBCOMMFAIL:
+					case XAException.XA_RBDEADLOCK:
+					case XAException.XA_RBINTEGRITY:
+					case XAException.XA_RBOTHER:
+					case XAException.XA_RBPROTO:
+					case XAException.XA_RBTIMEOUT:
+					case XAException.XA_RBTRANSIENT:
+					case XAException.XAER_RMERR:
 						forget() ;
 						return TwoPhaseOutcome.FINISH_ERROR;
 					case XAException.XAER_NOTA:

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java	2007-01-19 10:34:16 UTC (rev 8916)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java	2007-01-19 10:45:30 UTC (rev 8917)
@@ -558,6 +558,8 @@
 						case XAException.XAER_NOTA:
 						case XAException.XAER_PROTO:
 							break;
+						case XAException.XA_RETRY:
+							throw new UNKNOWN();
 						case XAException.XAER_INVAL:
 						case XAException.XAER_RMFAIL: // resource manager
 													  // failed, did it
@@ -742,7 +744,6 @@
 					
 					switch (e1.errorCode)
 					{
-					case XAException.XAER_RMERR:
 					case XAException.XA_HEURHAZ:
 					case XAException.XA_HEURMIX:
 						updateState(TwoPhaseOutcome.HEURISTIC_HAZARD);
@@ -752,6 +753,15 @@
 						handleForget() ;
 						break;
 					case XAException.XA_HEURRB:
+					case XAException.XA_RBROLLBACK:
+					case XAException.XA_RBCOMMFAIL:
+					case XAException.XA_RBDEADLOCK:
+					case XAException.XA_RBINTEGRITY:
+					case XAException.XA_RBOTHER:
+					case XAException.XA_RBPROTO:
+					case XAException.XA_RBTIMEOUT:
+					case XAException.XA_RBTRANSIENT:
+					case XAException.XAER_RMERR:
 						handleForget() ;
 						throw new TRANSACTION_ROLLEDBACK();
 					case XAException.XAER_NOTA: