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

Fix possible NPE

Browse Source 
- getState() now handles null better when checking
  running state when possibly going to return
  final state.
- Fixes #227
This commit is contained in:
Janne Valkealahti
2016-05-21 09:54:21 +01:00
parent 588eee751f
commit e9cb3af785
5 changed files with 233 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
public State<S,E> getState() {
// if we're complete assume we're stopped
// and state was stashed into lastState
if (isComplete()) {
if (lastState != null && isComplete()) {
return lastState;
} else {
return currentState;
@@ -388,11 +388,12 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
@Override
public boolean isComplete() {
if (currentState == null) {
State<S, E> s = currentState;
if (s == null) {
return !isRunning();
} else {
return currentState != null && currentState.getPseudoState() != null
&& currentState.getPseudoState().getKind() == PseudoStateKind.END;
return s != null && s.getPseudoState() != null
&& s.getPseudoState().getKind() == PseudoStateKind.END;
}
}