Restore all regions of statemachine

egreijus · jvalkeal · commit 7d7765cc75de · 2021-06-27T10:09:50.000+01:00
- Restore all regions of statemachine - A persisted statemachine with orthogonal states will not be correctly restored as only the top region gets correctly reset. Tests in StateMachineResetTests use the correct way to reset the statemachine with all regions - Backport #978 - Fixes #980
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java
@@ -168,7 +168,7 @@ protected StateMachine<S, E> restoreStateMachine(StateMachine<S, E> stateMachine
 		}
 		stateMachine.stop();
 		// only go via top region
-		stateMachine.getStateMachineAccessor().doWithRegion(new StateMachineFunction<StateMachineAccess<S, E>>() {
+		stateMachine.getStateMachineAccessor().doWithAllRegions(new StateMachineFunction<StateMachineAccess<S, E>>() {
 
 			@Override
 			public void apply(StateMachineAccess<S, E> function) {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ protected StateMachine<S, E> restoreStateMachine(StateMachine<S, E> stateMachine`
`168`	`168`	`}`
`169`	`169`	`stateMachine.stop();`
`170`	`170`	`// only go via top region`
`171`		`- stateMachine.getStateMachineAccessor().doWithRegion(new StateMachineFunction<StateMachineAccess<S, E>>() {`
	`171`	`+ stateMachine.getStateMachineAccessor().doWithAllRegions(new StateMachineFunction<StateMachineAccess<S, E>>() {`
`172`	`172`
`173`	`173`	`@Override`
`174`	`174`	`public void apply(StateMachineAccess<S, E> function) {`