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

Reactive test changes for core

Browse Source 
- Relates #750
This commit is contained in:
Janne Valkealahti
2019-05-14 07:09:19 +01:00
parent aed1ba5aaa
commit c213f62aef
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-statemachine-core/src/main/java/org/springframework/statemachine/persist/AbstractStateMachinePersister.java
View File

@@ -68,7 +68,7 @@ public abstract class AbstractStateMachinePersister<S, E, T> implements StateMac
@Override
public final StateMachine<S, E> restore(StateMachine<S, E> stateMachine, T contextObj) throws Exception {
final StateMachineContext<S, E> context = stateMachinePersist.read(contextObj);
stateMachine.stop();
stateMachine.stopReactively().block();
stateMachine.getStateMachineAccessor().doWithAllRegions(new StateMachineFunction<StateMachineAccess<S, E>>() {
@Override
@@ -76,7 +76,7 @@ public abstract class AbstractStateMachinePersister<S, E, T> implements StateMac
function.resetStateMachine(context);
}
});
stateMachine.start();
stateMachine.startReactively().block();
return stateMachine;
}

8
spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java
View File

@@ -111,7 +111,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
StateMachine<S, E> stateMachine = machines.remove(machineId);
if (stateMachine != null) {
log.info("Found machine with id " + machineId);
stateMachine.stop();
stateMachine.stopReactively().block();
}
}
}
@@ -163,7 +163,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
if (stateMachineContext == null) {
return stateMachine;
}
stateMachine.stop();
stateMachine.stopReactively().block();
// only go via top region
stateMachine.getStateMachineAccessor().doWithRegion(new StateMachineFunction<StateMachineAccess<S, E>>() {
@@ -180,7 +180,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
if (!((Lifecycle) stateMachine).isRunning()) {
StartListener<S, E> listener = new StartListener<>(stateMachine);
stateMachine.addStateListener(listener);
stateMachine.start();
stateMachine.startReactively().block();
try {
listener.latch.await();
} catch (InterruptedException e) {
@@ -195,7 +195,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
if (((Lifecycle) stateMachine).isRunning()) {
StopListener<S, E> listener = new StopListener<>(stateMachine);
stateMachine.addStateListener(listener);
stateMachine.stop();
stateMachine.stopReactively().block();
try {
listener.latch.await();
} catch (InterruptedException e) {