From 008316f43498443616636778676fdcf009ffa2d4 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 2 Mar 2016 08:23:36 +0000
Subject: [PATCH] Set executor for TimerTrigger

- Polish PR #178
- Also set taskExecutor
---
 .../config/AbstractStateMachineFactory.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
index b1a34556..22206f18 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
@@ -556,10 +556,12 @@ public abstract class AbstractStateMachineFactory<S, E> extends LifecycleObjectS
 				if (beanFactory != null) {
 					t.setBeanFactory(beanFactory);
 				}
-                                if( taskScheduler != null )
-                                {
-                                        t.setTaskScheduler(taskScheduler);
-                                }
+				if (taskExecutor != null) {
+					t.setTaskExecutor(taskExecutor);
+				}
+				if (taskScheduler != null) {
+					t.setTaskScheduler(taskScheduler);
+				}
 				trigger = t;
 			}