[jboss-svn-commits] JBL Code SVN: r30474 - labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore.

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

Author: mark.little at jboss.com
Date: 2009-12-04 08:11:16 -0500 (Fri, 04 Dec 2009)
New Revision: 30474

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
Log:
https://jira.jboss.org/jira/browse/JBTM-605

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	2009-12-04 13:10:54 UTC (rev 30473)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2009-12-04 13:11:16 UTC (rev 30474)
@@ -866,6 +866,8 @@
 	                    forget();
 	                    break;
 	                case XAException.XA_HEURRB:
+	                       forget();
+	                       return TwoPhaseOutcome.ONE_PHASE_ERROR;
 	                case XAException.XA_RBROLLBACK:
 	                case XAException.XA_RBCOMMFAIL:
 	                case XAException.XA_RBDEADLOCK:
@@ -875,7 +877,6 @@
 	                case XAException.XA_RBTIMEOUT:
 	                case XAException.XA_RBTRANSIENT:
 	                case XAException.XAER_RMERR:
-	                    forget();
 	                    return TwoPhaseOutcome.ONE_PHASE_ERROR;
 	                case XAException.XAER_NOTA:
 	                    return TwoPhaseOutcome.HEURISTIC_HAZARD; // something committed or rolled back without asking us!