Author: lresende
Date: Sat Mar 13 17:03:50 2010
New Revision: 922611
URL: http://svn.apache.org/viewvc?rev=922611&view=rev
Log:
TUSCANY-3475 - Merging changes from 1.x
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=922611&r1=922610&r2=922611&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Sat Mar 13 17:03:50 2010
@@ -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;