Do not let RMFAIL handling interfere with the other case statements

jbosstm · Nov 1, 2024 · 0546657 · 0546657
1 parent c3791ca
commit 0546657
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.../jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java b/.../jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
@@ -391,12 +391,6 @@ public void rollback() throws org.omg.CORBA.SystemException,
                                 _rolledBack = true;
                                 destroyState();
                                 break;
-                            case XAException.XAER_NOTA:
-                                if (_phaseTwoStarted) {
-                                    // rolled back previously and recovery completed
-                                    destroyState();
-                                    break;
-                                }
                             case XAException.XAER_RMFAIL:
                                 if (_prepared) {
                                     /*
@@ -409,6 +403,12 @@ public void rollback() throws org.omg.CORBA.SystemException,
                                 // We don't want to report a heuristic as we don't know it won't rollback so throw UNKNOWN
                                 // (noting we end up in the finally for further processing)
                                 throw new UNKNOWN();
+                            case XAException.XAER_NOTA:
+                                if (_phaseTwoStarted) {
+                                    // rolled back previously and recovery completed
+                                    destroyState();
+                                    break;
+                                }
                             default:
                                 destroyState();