From 963f06199b5c9a62c4bc2156443ed3032e8f46cd Mon Sep 17 00:00:00 2001
From: Jingliu Xiong <928124786@qq.com>
Date: Sat, 6 Apr 2024 21:16:40 +0800
Subject: [PATCH 1/2] fix(6257): fix saga mode replay context lost start in 2.x

---
 .../seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
index c055c8dc23b..9d05f5e2749 100644
--- a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
+++ b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
@@ -358,7 +358,7 @@ private Map<String, Object> getStateMachineContextVariables(StateMachineInstance
 
     protected Map<String, Object> replayContextVariables(StateMachineInstance stateMachineInstance) {
         Map<String, Object> contextVariables = new HashMap<>();
-        if (stateMachineInstance.getStartParams() == null) {
+        if (stateMachineInstance.getStartParams() != null) {
             contextVariables.putAll(stateMachineInstance.getStartParams());
         }
 

From c4ea9dcd09d2210834e2ec6d030e1375961adc5c Mon Sep 17 00:00:00 2001
From: Jingliu Xiong <928124786@qq.com>
Date: Sat, 6 Apr 2024 21:26:53 +0800
Subject: [PATCH 2/2] fix(6257): add changes doc

---
 changes/en-us/2.x.md | 1 +
 changes/zh-cn/2.x.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index be4b6ce8079..21cbc90a36d 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -34,6 +34,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6372](https://github.com/apache/incubator-seata/pull/6372)] fix initializing the sql file postgresql.sql index name conflict
 - [[#6380](https://github.com/apache/incubator-seata/pull/6380)] fix sql exception when checking for the existence of the UNDO_LOG table on SQL server
 - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] fix the bug where Role.participant does not execute hooks but clears them.
+- [[#6465](https://github.com/apache/incubator-seata/pull/6465)] fix(6257): fix saga mode replay context lost start in 2.x
 
 ### optimize:
 - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] add a check for the existence of the undolog table
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 61229c5ce66..e9c1c29736b 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -34,7 +34,7 @@
 - [[#6372](https://github.com/apache/incubator-seata/pull/6372)] 修复初始化sql文件postgresql.sql 索引名称冲突问题
 - [[#6380](https://github.com/apache/incubator-seata/pull/6380)] 修复针对sql server检查UNDO_LOG表是否存在时的SQL异常
 - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] 修复Role.Participant不执行hook但会清理的问题
-
+- [[#6465](https://github.com/apache/incubator-seata/pull/6465)] 修复2.0下saga模式的context replay丢失start问题
 
 
 ### optimize: