Skip to content

Commit

Permalink
bugfix: fix the issue of xaEnded not being reset (#6627)
Browse files Browse the repository at this point in the history
  • Loading branch information
tanyaofei authored Jun 26, 2024
1 parent ac2e7a2 commit 7a4d39e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions changes/en-us/2.x.md
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
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)

同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
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

0 comments on commit 7a4d39e

Please sign in to comment.