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 a1bb731c80 bugfix: report branch status add branchType (#7992)
a1bb731c80 is described below
commit a1bb731c80f4443cb297679d906d77bdb419d1c3
Author: shukai <[email protected]>
AuthorDate: Tue Feb 10 09:33:28 2026 +0800
bugfix: report branch status add branchType (#7992)
---
changes/en-us/2.x.md | 3 ++-
changes/zh-cn/2.x.md | 2 ++
rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 225151ba00..975cac02a7 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -33,7 +33,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7960](https://github.com/apache/incubator-seata/pull/7960)] fix
consoleApiService bean that could not be found
- [[#7956](https://github.com/apache/incubator-seata/pull/7956)] fix empty
jacoco report on local when jdk above 17
- [[#7965](https://github.com/apache/incubator-seata/pull/7965)] fix the issue
where different element order in two lists causes failure to set the index as
the primary key
-
+- [[#7992](https://github.com/apache/incubator-seata/pull/7992)] fix report
branch transaction status without setting branch type
### optimize:
@@ -73,6 +73,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [sddtc](https://github.com/sddtc)
- [xingfudeshi](https://github.com/xingfudeshi)
- [Sumit6307](https://github.com/Sumit6307)
+- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
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 a4e66b0b6f..0f404b2b2c 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -33,6 +33,7 @@
- [[#7960](https://github.com/apache/incubator-seata/pull/7960)]
修复consoleApiService bean未加载的问题
- [[#7956](https://github.com/apache/incubator-seata/pull/7956)]
修复本地JDK17以上jacoco报告为空的问题
- [[#7965](https://github.com/apache/incubator-seata/pull/7965)] 修复在 dm 和
kingbase 中当没有将索引设置为主键索引时出现的问题
+- [[#7992](https://github.com/apache/incubator-seata/pull/7992)]
修复报告分支事务状态时没有设置分支类型
### optimize:
@@ -77,5 +78,6 @@
- [sddtc](https://github.com/sddtc)
- [xingfudeshi](https://github.com/xingfudeshi)
- [Sumit6307](https://github.com/Sumit6307)
+- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java
b/rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java
index bfd929e0ce..9e27842065 100644
--- a/rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java
+++ b/rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java
@@ -130,6 +130,7 @@ public abstract class AbstractResourceManager implements
ResourceManager {
BranchReportRequest request = new BranchReportRequest();
request.setXid(xid);
request.setBranchId(branchId);
+ request.setBranchType(branchType);
request.setStatus(status);
request.setApplicationData(applicationData);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
