TUSCANY-3475 - Merging changes from 1.x

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@922611 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index a602fa3647..939c33c21c 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
@@ -327,8 +327,9 @@ public class EmbeddedODEServer {
     	odeProperties.put("ode.scheduler.staleInterval", "100000" );
     	
         SimpleScheduler scheduler = new SimpleScheduler(new GUID().toString(),
-        		                                        new JdbcDelegate(_db.getDataSource()),
+        		                                new JdbcDelegate(_db.getDataSource()),
                                                         odeProperties );
+        scheduler.setExecutorService(_executorService);
         scheduler.setTransactionManager(_txMgr);
 
         return scheduler;