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

Fix problems in JoinPseudoState

Browse Source 
- Fix possible NPE which is a regression.
- Fix state entry notification for JOIN states.
- Fixes #229
This commit is contained in:
Janne Valkealahti
2016-11-06 14:39:19 +00:00
parent c48f671ee1
commit d1f7f31aeb
6 changed files with 1187 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java
View File

@@ -105,7 +105,8 @@ public class JoinPseudoState<S, E> extends AbstractPseudoState<S, E> {
@Override
public void onEntry(StateContext<S, E> context) {
if (StateMachineUtils.isPseudoState(context.getTransition().getTarget(), PseudoStateKind.END)) {
if (context.getTransition() != null && StateMachineUtils
.isPseudoState(context.getTransition().getTarget(), PseudoStateKind.END)) {
if (!notified && track.size() > 0) {
track.remove(t);
if (track.size() == 0) {

6
spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
View File

@@ -1142,7 +1142,11 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
}
}
notifyStateEntered(buildStateContext(Stage.STATE_ENTRY, message, transition, getRelayStateMachine(), null, state));
// with linked joins, we need to enter state but should not notify.
// state entries are needed to track join logic.
if (!StateMachineUtils.isPseudoState(state, PseudoStateKind.JOIN)) {
notifyStateEntered(buildStateContext(Stage.STATE_ENTRY, message, transition, getRelayStateMachine(), null, state));
}
log.debug("Enter state=[" + state + "]");
state.entry(stateContext);
}