Skip to content

Commit 15b4273

Browse files
authored
bugfix: fix branchType server decode error (#7127)
1 parent d3e2b76 commit 15b4273

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

changes/en-us/2.3.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ The version is updated as follows:
5050
- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
5151
- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] fix tableMeta refresh after closed
5252
- [[#7117](https://github.com/apache/incubator-seata/pull/7117)] fix prefix: seata.server.raft.ssl should not be null
53+
- [[#7127](https://github.com/apache/incubator-seata/pull/7127)] fix branchType server decode error
5354

5455

5556
### optimize:

changes/zh-cn/2.3.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Apache Seata(incubating) 是一款开源的分布式事务解决方案,提供
4343
- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] 修复vGroupMappingManager未初始化的问题
4444
- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] 修复TableMeta在数据源关闭后刷新错误问题
4545
- [[#7117](https://github.com/apache/incubator-seata/pull/7117)] 修复 seata.server.raft.ssl 前缀不存在的问题
46+
- [[#7127](https://github.com/apache/incubator-seata/pull/7127)] 修复saga注解化导致的server branchType解码失败问题
4647

4748

4849
### optimize:

core/src/main/java/org/apache/seata/core/model/BranchType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ public enum BranchType {
3939
SAGA,
4040

4141
/**
42-
* The SAGA_ANNOTATION.
42+
* The XA.
4343
*/
44-
SAGA_ANNOTATION,
44+
XA,
4545

4646
/**
47-
* The XA.
47+
* The SAGA_ANNOTATION.
4848
*/
49-
XA;
49+
SAGA_ANNOTATION;
5050

5151
/**
5252
* Get branch type.

0 commit comments

Comments
 (0)