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 #6873

Closed
wants to merge 4 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90002cc
bugfix:
MaoMaoandSnail Sep 21, 2024
8dbf79b
Merge branch '2.x' into 2.x
funky-eyes Sep 21, 2024
94a265f
Merge branch '2.x' into 2.x
funky-eyes Sep 25, 2024
4417cc8
optimize: Correct word spelling errors
MaoMaoandSnail Sep 28, 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
6 changes: 3 additions & 3 deletions ...engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ protected StateMachineInstance forwardInternal(String stateMachineInstId, Map<St
if (replaceParams != null) {
contextVariables.putAll(replaceParams);
}
putBusinesskeyToContextariables(stateMachineInstance, contextVariables);
putBusinessKeyToContextVariables(stateMachineInstance, contextVariables);

ConcurrentHashMap<String, Object> concurrentContextVariables = new ConcurrentHashMap<>(contextVariables.size());
nullSafeCopy(contextVariables, concurrentContextVariables);
Expand Down Expand Up @@ -508,7 +508,7 @@ public StateMachineInstance compensateInternal(String stateMachineInstId, Map<St
if (replaceParams != null) {
contextVariables.putAll(replaceParams);
}
putBusinesskeyToContextariables(stateMachineInstance, contextVariables);
putBusinessKeyToContextVariables(stateMachineInstance, contextVariables);

ConcurrentHashMap<String, Object> concurrentContextVariables = new ConcurrentHashMap<>(contextVariables.size());
nullSafeCopy(contextVariables, concurrentContextVariables);
Expand Down Expand Up @@ -696,7 +696,7 @@ private String buildExceptionMessage(StateMachineInstance stateMachineInstance,
return stringBuilder.toString();
}

private void putBusinesskeyToContextariables(StateMachineInstance stateMachineInstance,
private void putBusinessKeyToContextVariables(StateMachineInstance stateMachineInstance,
Map<String, Object> contextVariables) {
if (StringUtils.hasText(stateMachineInstance.getBusinessKey()) && !contextVariables.containsKey(
DomainConstants.VAR_NAME_BUSINESSKEY)) {
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