summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-13 17:03:50 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-13 17:03:50 +0000
commitbcb179aa3c9b2d7136b7236d35bd0733703b5a97 (patch)
tree470e1bdc4014b3d5ced1c19b0b3c6495b2e142fc
parent8f939f75e0bc7213c8a8f673c63a2d39708cdfa6 (diff)
TUSCANY-3475 - Merging changes from 1.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@922611 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java3
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;