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 ba1f7536f6 bugfix: Fix missing branchType in BusinessActionContext
(#7188)
ba1f7536f6 is described below
commit ba1f7536f65791901ae2cdf4fb48270a8aad9c62
Author: Yongjun Hong <dev.yongj...@gmail.com>
AuthorDate: Mon Mar 3 14:39:55 2025 +0900
bugfix: Fix missing branchType in BusinessActionContext (#7188)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 2 ++
tcc/src/main/java/org/apache/seata/rm/tcc/TCCResourceManager.java | 3 +++
3 files changed, 6 insertions(+)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 5ee09f6c0b..4297d7045c 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -27,6 +27,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7135](https://github.com/apache/incubator-seata/pull/7135)] treating a
unique index conflict during rollback as a dirty write
- [[#7150](https://github.com/apache/incubator-seata/pull/7150)] The time
difference between the raft node and the follower node cannot synchronize data
- [[#7102](https://github.com/apache/incubator-seata/pull/7150)] bugfix:
modify XA mode pre commit transaction from commit phase to before close phase
+- [[#7188](https://github.com/apache/incubator-seata/pull/7188)] bugfix: Fix
missing branchType in BusinessActionContext
### optimize:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index e46730f8c0..f0e03e29d1 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -27,6 +27,8 @@
- [[#7135](https://github.com/apache/incubator-seata/pull/7135)]
回滚时遇到唯一索引冲突视为脏写
- [[#7150](https://github.com/apache/incubator-seata/pull/7150)]
raft节点之前时间差，follower节点无法同步数据
- [[#7102](https://github.com/apache/incubator-seata/pull/7150)]
将XA模式预提交事务从提交阶段修改为关闭前阶段
+- [[#7188](https://github.com/apache/incubator-seata/pull/7188)] 修复
BusinessActionContext 中缺少的 branchType
+
### optimize:
diff --git a/tcc/src/main/java/org/apache/seata/rm/tcc/TCCResourceManager.java
b/tcc/src/main/java/org/apache/seata/rm/tcc/TCCResourceManager.java
index ca49136ae1..e252caf0ca 100644
--- a/tcc/src/main/java/org/apache/seata/rm/tcc/TCCResourceManager.java
+++ b/tcc/src/main/java/org/apache/seata/rm/tcc/TCCResourceManager.java
@@ -121,6 +121,7 @@ public class TCCResourceManager extends
AbstractResourceManager {
//BusinessActionContext
businessActionContext =
BusinessActionContextUtil.getBusinessActionContext(xid, branchId, resourceId,
applicationData);
+ businessActionContext.setBranchType(branchType);
Object[] args = this.getTwoPhaseCommitArgs(tccResource,
businessActionContext);
//share actionContext implicitly
@@ -188,6 +189,8 @@ public class TCCResourceManager extends
AbstractResourceManager {
//BusinessActionContext
businessActionContext =
BusinessActionContextUtil.getBusinessActionContext(xid, branchId, resourceId,
applicationData);
+ businessActionContext.setBranchType(branchType);
+
Object[] args = this.getTwoPhaseRollbackArgs(tccResource,
businessActionContext);
//share actionContext implicitly
BusinessActionContextUtil.setContext(businessActionContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
