Skip to content

bugfix: fix the issue of xaEnded not being reset #6627

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
funky-eyes merged 4 commits into from
Jun 26, 2024
Merged

bugfix: fix the issue of xaEnded not being reset #6627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec64846
bugfix: fix the issue of xaEnded not being reset (#6627)
tanyaofei Jun 22, 2024
0cf3e53
add change
tanyaofei Jun 24, 2024
e28c6b4
add change
tanyaofei Jun 25, 2024
6c86c36
Merge branch '2.x' into 2.x-fix
funky-eyes Jun 26, 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
2 changes: 2 additions & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Add changes here for all PR submitted to the 2.x branch.
### bugfix:
- [[#6592](https://github.com/apache/incubator-seata/pull/6592)] fix @Async annotation not working in ClusterWatcherManager
- [[#6624](https://github.com/apache/incubator-seata/pull/6624)] fix Alibaba Dubbo convert error
- [[#6627](https://github.com/apache/incubator-seata/pull/6627)] fix the issue of xaEnded not being reset
- [[#6626](https://github.com/apache/incubator-seata/pull/6626)] fix hsf ConsumerModel convert error


Expand Down Expand Up @@ -36,5 +37,6 @@ Thanks to these contributors for their code commits. Please report an unintended
- [YeonCheolGit](https://github.com/YeonCheolGit)
- [liuqiufeng](https://github.com/liuqiufeng)
- [Bughue](https://github.com/Bughue)
- [tanyaofei](https://github.com/tanyaofei)

Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
2 changes: 2 additions & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### bugfix:
- [[#6592](https://github.com/apache/incubator-seata/pull/6592)] fix @Async注解ClusterWatcherManager中不生效的问题
- [[#6624](https://github.com/apache/incubator-seata/pull/6624)] 修复 Alibaba Dubbo 转换错误
- [[#6627](https://github.com/apache/incubator-seata/pull/6627)] 修复 xaEnded 没有重置
- [[#6626](https://github.com/apache/incubator-seata/pull/6626)] 修复 hsf ConsumerModel 转换错误


Expand All @@ -32,5 +33,6 @@
- [YeonCheolGit](https://github.com/YeonCheolGit)
- [liuqiufeng](https://github.com/liuqiufeng)
- [Bughue](https://github.com/Bughue)
- [tanyaofei](https://github.com/tanyaofei)
Copy link
Contributor

@funky-eyes funky-eyes Jun 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

英文版中没有登记作者信息

Copy link
Contributor Author

@tanyaofei tanyaofei Jun 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已补充


同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
2 changes: 1 addition & 1 deletion 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 @@ -290,6 +290,7 @@ private synchronized void end(int flags) throws XAException, SQLException {
}

private void cleanXABranchContext() {
xaEnded = false;
branchRegisterTime = null;
prepareTime = null;
xaActive = false;
Expand Down Expand Up @@ -323,7 +324,6 @@ protected synchronized void closeForce() throws SQLException {
}
// Force close the physical connection
physicalConn.close();
xaEnded = false;
rollBacked = false;
cleanXABranchContext();
originalConnection.close();
Expand Down