Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong transition with join complete

Browse Source 
- Oversight with original reactor work.
This commit is contained in:
Janne Valkealahti
2020-10-24 09:53:48 +01:00
parent bb46cdbad6
commit 066e80dbdd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ForkJoinEntryExitTests.java
View File

@@ -92,8 +92,8 @@ public class ForkJoinEntryExitTests extends AbstractBuildTests {
.step()
.sendEvent("E3")
.expectStateEntered(2)
// TODO: S211 exited twice
.expectStateExited(4)
.expectStateExited("S220", "S211", "S221", "S2")
.expectStates("S3").and()
.build();
plan.test();
@@ -123,8 +123,8 @@ public class ForkJoinEntryExitTests extends AbstractBuildTests {
.step()
.sendEvent("E3")
.expectStateEntered(2)
// TODO: S211 exited twice
.expectStateExited(4)
.expectStateExited("S220", "S211", "S221", "S2")
.expectStates("S3").and()
.build();
plan.test();

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/support/ReactiveStateMachineExecutor.java
View File

@@ -386,7 +386,7 @@ public class ReactiveStateMachineExecutor<S, E> extends LifecycleObjectSupport i
return Flux.fromIterable(joinSyncTransitions)
.flatMap(tt -> {
StateContext<S, E> stateContext = buildStateContext(queuedMessage, tt, relayStateMachine);
return tt.transit(stateContext).then(stateMachineExecutorTransit.transit(t, stateContext, queuedMessage));
return tt.transit(stateContext).then(stateMachineExecutorTransit.transit(tt, stateContext, queuedMessage));
})
.doFinally(s -> {
joinSyncTransitions.clear();