Skip to content

bugfix:Use xaActive to determine whether xaResource needs to execute the end method #7708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 2.x
Choose a base branch
from
Open

bugfix:Use xaActive to determine whether xaResource needs to execute the end method #7708

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff37a0
bugfix:fix https://github.com/apache/incubator-seata/issues/7690
Oct 17, 2025
ce2dfed
add:registered PR
Oct 20, 2025
0000f82
Merge branch '2.x' into bugfix-xa-rollback-error
Oct 20, 2025
ae3d2e1
add:add GitHub ID
Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ public class ConnectionProxyXA extends AbstractConnectionProxyXA implements Hold

private volatile boolean xaActive = false;

private volatile boolean xaEnded = false;

private volatile boolean kept = false;

private volatile boolean rollBacked = false;
Expand Down Expand Up @@ -119,9 +117,9 @@ private void releaseIfNecessary() {
}

private void xaEnd(XAXid xaXid, int flags) throws XAException {
if (!xaEnded) {
if (xaActive) {
xaResource.end(xaXid, flags);
xaEnded = true;
xaActive = false;
}
}

Expand Down Expand Up @@ -302,7 +300,6 @@ private synchronized void end(int flags) throws XAException, SQLException {
}

private void cleanXABranchContext() {
xaEnded = false;
branchRegisterTime = null;
prepareTime = null;
xaActive = false;
Expand Down
Loading