Author: jeff.yuchang Date: 2011-10-20 04:48:18 -0400 (Thu, 20 Oct 2011) New Revision: 1466 Modified: branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Log: * Added the AcquireInstanceLock method back, otherwise, it caused the flow example failure. Will remove it again once fix this failure. Modified: branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java =================================================================== --- branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2011-10-19 05:59:49 UTC (rev 1465) +++ branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java 2011-10-20 08:48:18 UTC (rev 1466) @@ -404,7 +404,7 @@ if( __log.isTraceEnabled() ) __log.trace("[JOB] onScheduledJob " + jobInfo + "" + we.getInstanceId()); - //acquireInstanceLock(we.getInstanceId()); + acquireInstanceLock(we.getInstanceId()); // DONT PUT CODE HERE-need this method real tight in a try/catch block, we need to handle // all types of failure here, the scheduler is not going to know how to handle our errors, Modified: branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java =================================================================== --- branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-10-19 05:59:49 UTC (rev 1465) +++ branches/RiftSaw-ODE-2.3.x/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-10-20 08:48:18 UTC (rev 1466) @@ -299,7 +299,7 @@ return true; } else if (routing.messageRoute != null) { // Found a route, hitting it - //_engine.acquireInstanceLock(routing.messageRoute.getTargetInstance().getInstanceId()); + _engine.acquireInstanceLock(routing.messageRoute.getTargetInstance().getInstanceId()); target.invokeInstance(mex, routing); return true; }