bugfix: modify XA mode pre commit transaction from commit phase to before close phase

rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java

@@ -117,6 +117,10 @@ private void xaEnd(XAXid xaXid, int flags) throws XAException {
         if (!xaEnded) {
             xaResource.end(xaXid, flags);
             xaEnded = true;
+        } else {
+            if (flags == XAResource.TMSUCCESS) {
+                xaResource.end(xaXid, flags);
+            }
         }
     }
 
@@ -172,30 +176,40 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
             // According to JDBC spec:
             // If this method is called during a transaction and the
             // auto-commit mode is changed, the transaction is committed.
-            if (xaActive) {
+            if (xaActive && !xaEnded) {
                 commit();
             }
         } else {
-            if (xaActive) {
-                throw new SQLException("should NEVER happen: setAutoCommit from true to false while xa branch is active");
-            }
-            // Start a XA branch
-            long branchId;
-            try {
-                // 1. register branch to TC then get the branch message
-                branchRegisterTime = System.currentTimeMillis();
-                branchId = DefaultResourceManager.get().branchRegister(BranchType.XA, resource.getResourceId(), null, xid, null,
-                        null);
-            } catch (TransactionException te) {
-                cleanXABranchContext();
-                throw new SQLException("failed to register xa branch " + xid + " since " + te.getCode() + ":" + te.getMessage(), te);
+            int flags;
+            if (this.xaBranchXid != null && currentAutoCommitStatus) {
+                flags = XAResource.TMJOIN;
+            } else {
+                if (xaActive) {
+                    throw new SQLException("should NEVER happen: setAutoCommit from true to false while xa branch is active");
+                }
+                if (JdbcConstants.ORACLE.equals(resource.getDbType())) {
+                    flags = SeataXAResource.ORATRANSLOOSE;
+                } else {
+                    flags = XAResource.TMNOFLAGS;
+                }
+                // Start a XA branch
+                long branchId;
+                try {
+                    // 1. register branch to TC then get the branch message
+                    branchRegisterTime = System.currentTimeMillis();
+                    branchId = DefaultResourceManager.get().branchRegister(BranchType.XA, resource.getResourceId(), null, xid, null,
+                            null);
+                } catch (TransactionException te) {
+                    cleanXABranchContext();
+                    throw new SQLException("failed to register xa branch " + xid + " since " + te.getCode() + ":" + te.getMessage(), te);
+                }
+                // 2. build XA-Xid with xid and branchId
+                this.xaBranchXid = XAXidBuilder.build(xid, branchId);
             }
-            // 2. build XA-Xid with xid and branchId
-            this.xaBranchXid = XAXidBuilder.build(xid, branchId);
             // Keep the Connection if necessary
             keepIfNecessary();
             try {
-                start();
+                start(flags);
             } catch (XAException e) {
                 cleanXABranchContext();
                 throw new SQLException("failed to start xa branch " + xid + " since " + e.getMessage(), e);
@@ -223,34 +237,10 @@ public synchronized void commit() throws SQLException {
             throw new SQLException("should NOT commit on an inactive session", SQLSTATE_XA_NOT_END);
         }
         try {
-            // XA End: Success
-            try {
-                end(XAResource.TMSUCCESS);
-            } catch (SQLException sqle) {
-                // Rollback immediately before the XA Branch Context is deleted.
-                String xaBranchXid = this.xaBranchXid.toString();
-                rollback();
-                throw new SQLException("Branch " + xaBranchXid + " was rollbacked on committing since " + sqle.getMessage(), SQLSTATE_XA_NOT_END, sqle);
-            }
-            long now = System.currentTimeMillis();
-            checkTimeout(now);
-            setPrepareTime(now);
-            int prepare = xaResource.prepare(xaBranchXid);
-            // Based on the four databases: MySQL (8), Oracle (12c), Postgres (16), and MSSQL Server (2022),
-            // only Oracle has read-only optimization; the others do not provide read-only feedback.
-            // Therefore, the database type check can be eliminated here.
-            if (prepare == XAResource.XA_RDONLY) {
-                // Branch Report to TC: RDONLY
-                reportStatusToTC(BranchStatus.PhaseOne_RDONLY);
-            }
-        } catch (XAException xe) {
-            // Branch Report to TC: Failed
-            reportStatusToTC(BranchStatus.PhaseOne_Failed);
-            throw new SQLException(
-                "Failed to end(TMSUCCESS)/prepare xa branch on " + xid + "-" + xaBranchXid.getBranchId() + " since " + xe
-                    .getMessage(), xe);
-        } finally {
-            cleanXABranchContext();
+            end(XAResource.TMSUCCESS);
+        } catch (XAException e) {
+            throw new SQLException("Failed to end(TMSUCCESS) xa branch on " + xid + "-" + xaBranchXid.getBranchId()
+                    + " since " + e.getMessage(), e);
         }
     }
 
@@ -280,13 +270,9 @@ public void rollback() throws SQLException {
         }
     }
 
-    private synchronized void start() throws XAException, SQLException {
+    private synchronized void start(int flags) throws XAException, SQLException {
         // 3. XA Start
-        if (JdbcConstants.ORACLE.equals(resource.getDbType())) {
-            xaResource.start(this.xaBranchXid, SeataXAResource.ORATRANSLOOSE);
-        } else {
-            xaResource.start(this.xaBranchXid, XAResource.TMNOFLAGS);
-        }
+        xaResource.start(this.xaBranchXid, flags);
 
         try {
             termination();
@@ -324,13 +310,36 @@ private void checkTimeout(Long now) throws XAException {
 
     @Override
     public synchronized void close() throws SQLException {
-        rollBacked = false;
-        if (isHeld() && shouldBeHeld()) {
-            // if kept by a keeper, just hold the connection.
-            return;
+        try {
+            if (xaEnded) {
+                long now = System.currentTimeMillis();
+                checkTimeout(now);
+                setPrepareTime(now);
+                int prepare = xaResource.prepare(xaBranchXid);
+                // Based on the four databases: MySQL (8), Oracle (12c), Postgres (16), and MSSQL Server (2022),
+                // only Oracle has read-only optimization; the others do not provide read-only feedback.
+                // Therefore, the database type check can be eliminated here.
+                if (prepare == XAResource.XA_RDONLY) {
+                    // Branch Report to TC: RDONLY
+                    reportStatusToTC(BranchStatus.PhaseOne_RDONLY);
+                }
+                xaEnded = false;
+            }
+        } catch (XAException xe) {
+            // Branch Report to TC: Failed
+            reportStatusToTC(BranchStatus.PhaseOne_Failed);
+            throw new SQLException(
+                    "Failed to end(TMSUCCESS)/prepare xa branch on " + xid + "-" + xaBranchXid.getBranchId() + " since " + xe
+                            .getMessage(), xe);
+        } finally {
+            rollBacked = false;
+            if (isHeld() && shouldBeHeld()) {
+                // if kept by a keeper, just hold the connection.
+            } else {
+                cleanXABranchContext();
+                originalConnection.close();
+            }
         }
-        cleanXABranchContext();
-        originalConnection.close();
     }
 
     protected synchronized void closeForce() throws SQLException {

rm-datasource/src/test/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXATest.java

@@ -85,7 +85,7 @@ public void testXABranchCommit() throws Throwable {
         connectionProxyXA.commit();
 
         Mockito.verify(xaResource).end(any(Xid.class), any(Integer.class));
-        Mockito.verify(xaResource).prepare(any(Xid.class));
+        Mockito.verify(xaResource, times(0)).prepare(any(Xid.class));
     }
 
     @Test