It may be appropriate to throw an UNKNOWN exception if we don't know …

…what happened during the rollback

ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java

@@ -336,6 +336,7 @@ public void rollback() throws org.omg.CORBA.SystemException,
                     }
                 }
 
+                boolean removeConnection = true;
                 // This is used to ensure that if xa_rollback fails
                 boolean destroyState = true;
                 try {
@@ -400,7 +401,10 @@ public void rollback() throws org.omg.CORBA.SystemException,
                                      */
                                     destroyState = false;
                                 }
-                                break;
+                                removeConnection = false;
+                                // 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
@@ -427,7 +431,9 @@ public void rollback() throws org.omg.CORBA.SystemException,
                     if (_prepared && destroyState) {
                         destroyState();
                     } else {
-                        removeConnection();
+                        if (removeConnection) {
+                            removeConnection();
+                        }
                     }
                 }
             }