Skip to content

Commit a1bb731

Browse files
bugfix: report branch status add branchType (#7992)
1 parent 6e07d2f commit a1bb731

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

changes/en-us/2.x.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Add changes here for all PR submitted to the 2.x branch.
3333
- [[#7960](https://github.com/apache/incubator-seata/pull/7960)] fix consoleApiService bean that could not be found
3434
- [[#7956](https://github.com/apache/incubator-seata/pull/7956)] fix empty jacoco report on local when jdk above 17
3535
- [[#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
36-
36+
- [[#7992](https://github.com/apache/incubator-seata/pull/7992)] fix report branch transaction status without setting branch type
3737

3838
### optimize:
3939

@@ -73,6 +73,7 @@ Thanks to these contributors for their code commits. Please report an unintended
7373
- [sddtc](https://github.com/sddtc)
7474
- [xingfudeshi](https://github.com/xingfudeshi)
7575
- [Sumit6307](https://github.com/Sumit6307)
76+
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
7677

7778

7879
Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- [[#7960](https://github.com/apache/incubator-seata/pull/7960)] 修复consoleApiService bean未加载的问题
3434
- [[#7956](https://github.com/apache/incubator-seata/pull/7956)] 修复本地JDK17以上jacoco报告为空的问题
3535
- [[#7965](https://github.com/apache/incubator-seata/pull/7965)] 修复在 dm 和 kingbase 中当没有将索引设置为主键索引时出现的问题
36+
- [[#7992](https://github.com/apache/incubator-seata/pull/7992)] 修复报告分支事务状态时没有设置分支类型
3637

3738

3839
### optimize:
@@ -77,5 +78,6 @@
7778
- [sddtc](https://github.com/sddtc)
7879
- [xingfudeshi](https://github.com/xingfudeshi)
7980
- [Sumit6307](https://github.com/Sumit6307)
81+
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
8082

8183
同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。

rm/src/main/java/org/apache/seata/rm/AbstractResourceManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public void branchReport(
130130
BranchReportRequest request = new BranchReportRequest();
131131
request.setXid(xid);
132132
request.setBranchId(branchId);
133+
request.setBranchType(branchType);
133134
request.setStatus(status);
134135
request.setApplicationData(applicationData);
135136

0 commit comments

Comments
 (0)