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

Jump to bottom

bugfix: DesignerJson to StandardJson: SubStateMachine CompensateState cannot be recognized #6890

Merged
merged 3 commits into from
Oct 8, 2024
Merged

bugfix: DesignerJson to StandardJson: SubStateMachine CompensateState cannot be recognized #6890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc0ece
bugfix: DesignerJson to StandardJson: SubStateMachine CompensateState…
MaoMaoandSnail Sep 28, 2024
daf7869
Merge branch '2.x' into bugfix_SubStateMachine_CompensateState_20240921
funky-eyes Oct 8, 2024
ed4bced
optimize: add register pr information and author information
MaoMaoandSnail Oct 8, 2024
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.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Add changes here for all PR submitted to the 2.x branch.

### bugfix:
- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine compensateState cannot be recognized

### optimize:
- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA read-only transaction
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### bugfix:
- [[#6899](https://github.com/apache/incubator-seata/pull/6899)] 修复file.conf打包后的读取
- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] 修复saga设计json转标准json过程中: 子状态机补偿节点无法被识别

### optimize:
- [[#6826](https://github.com/apache/incubator-seata/pull/6826)] 移除只读XA事务的分支注册操作
Expand Down
2 changes: 1 addition & 1 deletion ...g/src/main/java/org/apache/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private static void transformEdge(Map<String, Object> machineJsonObject, List<Ob
machineJsonObject.put("StartState", targetStateId);
//Make sure 'StartState' is before 'States'
machineJsonObject.put("States", machineJsonObject.remove("States"));
} else if ("ServiceTask".equals(sourceType)) {
} else if ("ServiceTask".equals(sourceType) || "SubStateMachine".equals(sourceType)) {
if (targetNode != null && "Compensation".equals(targetNode.get("stateType"))) {
sourceState.put("CompensateState", targetStateId);
} else {
Expand Down
Loading