This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new a24a43ee38 bugfix: fix saga mode replay context lost start in 2.x
(#6465)
a24a43ee38 is described below
commit a24a43ee389d24c8ae9d23d2cb792c4684d68c22
Author: Jingliu Xiong <928124...@qq.com>
AuthorDate: Sat Apr 6 22:44:09 2024 +0800
bugfix: fix saga mode replay context lost start in 2.x (#6465)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 2 +-
.../apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index be4b6ce807..21cbc90a36 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 61229c5ce6..e9c1c29736 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:
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 c055c8dc23..9d05f5e274 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 @@ public class ProcessCtrlStateMachineEngine implements
StateMachineEngine {
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());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
