This is an automated email from the ASF dual-hosted git repository.
yixia pushed a commit to branch 2.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.3.0 by this push:
new 15b42737f2 bugfix: fix branchType server decode error (#7127)
15b42737f2 is described below
commit 15b42737f29eef6263ea95ba284055beb0ee820f
Author: wt_better <yixia...@alibaba-inc.com>
AuthorDate: Tue Jan 21 15:34:32 2025 +0800
bugfix: fix branchType server decode error (#7127)
---
changes/en-us/2.3.0.md | 1 +
changes/zh-cn/2.3.0.md | 1 +
core/src/main/java/org/apache/seata/core/model/BranchType.java | 8 ++++----
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/changes/en-us/2.3.0.md b/changes/en-us/2.3.0.md
index 97362aaed4..f82799877d 100644
--- a/changes/en-us/2.3.0.md
+++ b/changes/en-us/2.3.0.md
@@ -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:
diff --git a/changes/zh-cn/2.3.0.md b/changes/zh-cn/2.3.0.md
index 2ba0fb9e60..b3f2fd9ada 100644
--- a/changes/zh-cn/2.3.0.md
+++ b/changes/zh-cn/2.3.0.md
@@ -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:
diff --git a/core/src/main/java/org/apache/seata/core/model/BranchType.java
b/core/src/main/java/org/apache/seata/core/model/BranchType.java
index 37ae5342b7..852c4c5cc3 100644
--- a/core/src/main/java/org/apache/seata/core/model/BranchType.java
+++ b/core/src/main/java/org/apache/seata/core/model/BranchType.java
@@ -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.
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
