bugfix: fix branchType server decode error (#7127)

apache · Jan 21, 2025 · 15b4273 · 15b4273
1 parent d3e2b76
commit 15b4273
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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.