This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 7a4d39e2b4 bugfix: fix the issue of xaEnded not being reset (#6627)
7a4d39e2b4 is described below
commit 7a4d39e2b4fe8482b5fd7673632ef0cbed2c3426
Author: tanyaofei <[email protected]>
AuthorDate: Wed Jun 26 17:45:21 2024 +0800
bugfix: fix the issue of xaEnded not being reset (#6627)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 2 ++
.../main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 2a18428aa4..78e5444629 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -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
@@ -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.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index e87f8e33e9..b3b603a507 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -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 转换错误
@@ -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和建议，非常感谢大家。
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
index 5f17b7ccc8..722b0cd20d 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
@@ -290,6 +290,7 @@ public class ConnectionProxyXA extends
AbstractConnectionProxyXA implements Hold
}
private void cleanXABranchContext() {
+ xaEnded = false;
branchRegisterTime = null;
prepareTime = null;
xaActive = false;
@@ -323,7 +324,6 @@ public class ConnectionProxyXA extends
AbstractConnectionProxyXA implements Hold
}
// Force close the physical connection
physicalConn.close();
- xaEnded = false;
rollBacked = false;
cleanXABranchContext();
originalConnection.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
