From a3cceee65138d52c44ac3756579d09cbc80d1744 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 6 May 2015 18:26:43 +0100
Subject: [PATCH] EnumStateMachineFactory doesn't always check initial state

- Adding initial state check
- Fixes #59
---
 .../statemachine/config/EnumStateMachineFactory.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
index 16c63351..60ee5491 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
@@ -295,7 +295,9 @@ public class EnumStateMachineFactory<S extends Enum<S>, E extends Enum<E>> exten
 			state = stateMap.get(stateData.getState());
 			if (state != null) {
 				states.add(state);
-				initialState = state;
+				if (stateData.isInitial()) {
+					initialState = state;					
+				}
 				continue;
 			}
 			if (stateMachine != null) {