Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: fix branchType server decode error #7127

Merged
merged 2 commits into from
Jan 21, 2025
Merged

bugfix: fix branchType server decode error #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4034b4a
fix seata server xa decode error
wt-better Jan 21, 2025
1af8890
add changes
wt-better Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.3.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The version is updated as follows:
- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] fix vGroupMappingManager is NOT init
- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] fix tableMeta refresh after closed
- [[#7117](https://github.com/apache/incubator-seata/pull/7117)] fix prefix: seata.server.raft.ssl should not be null
- [[#7127](https://github.com/apache/incubator-seata/pull/7127)] fix branchType server decode error


### optimize:
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.3.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Apache Seata(incubating) 是一款开源的分布式事务解决方案，提供
- [[#7025](https://github.com/apache/incubator-seata/pull/7025)] 修复vGroupMappingManager未初始化的问题
- [[#7044](https://github.com/apache/incubator-seata/pull/7044)] 修复TableMeta在数据源关闭后刷新错误问题
- [[#7117](https://github.com/apache/incubator-seata/pull/7117)] 修复 seata.server.raft.ssl 前缀不存在的问题
- [[#7127](https://github.com/apache/incubator-seata/pull/7127)] 修复saga注解化导致的server branchType解码失败问题


### optimize:
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/org/apache/seata/core/model/BranchType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ public enum BranchType {
SAGA,

/**
* The SAGA_ANNOTATION.
* The XA.
*/
SAGA_ANNOTATION,
XA,

/**
* The XA.
* The SAGA_ANNOTATION.
*/
XA;
SAGA_ANNOTATION;

/**
* Get branch type.
Expand Down