From 3e5efefc3329072be71a25c35d48e206c4134992 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Sat, 14 Mar 2015 16:17:28 +0000
Subject: [PATCH] Guard against null states

---
 .../statemachine/support/AbstractStateMachine.java             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
index 932cb945..2aabe401 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
@@ -388,6 +388,9 @@ public abstract class AbstractStateMachine<S, E> extends LifecycleObjectSupport
 			}
 
 			State<S,E> source = transition.getSource();
+			if (source == null || currentState == null) {
+				continue;
+			}
 			if (!StateMachineUtils.containsAtleastOne(source.getIds(), currentState.getIds())) {
 				continue;
 			}