Skip to content

bugfix: the issue where connection held during the first phase of PostgreSQL cannot be rollback #6825

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

Merged
merged 6 commits into from
Sep 9, 2024
Merged

bugfix: the issue where connection held during the first phase of PostgreSQL cannot be rollback #6825

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d1be20
Fix bug in https://github.com/apache/incubator-seata/issues/6814#even…
Sep 7, 2024
dfacfac
bugfix: XA mode transaction timeout and inability to roll back in Pos…
Sep 8, 2024
edcf633
bugfix: XA mode transaction timeout and inability to roll back in Pos…
Sep 8, 2024
0c120e7
bugfix: XA mode transaction timeout and inability to roll back in Pos…
Sep 8, 2024
12ed0c0
bugfix: XA mode transaction timeout and inability to roll back in Pos…
Sep 8, 2024
7fe906f
Merge branch '2.x' into bugfix-xa-timeout-rollback
funky-eyes Sep 9, 2024
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
8 changes: 6 additions & 2 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 @@ -140,8 +140,12 @@ public synchronized void xaCommit(String xid, long branchId, String applicationD
* @param applicationData application data
*/
public synchronized void xaRollback(String xid, long branchId, String applicationData) throws XAException {
XAXid xaXid = XAXidBuilder.build(xid, branchId);
xaRollback(xaXid);
if(this.xaBranchXid != null) {
xaRollback(xaBranchXid);
}else {
XAXid xaXid = XAXidBuilder.build(xid, branchId);
xaRollback(xaXid);
}
}

/**
Expand Down