You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/08/05 16:27:17 UTC

svn commit: r982641 - /ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java

Author: rr
Date: Thu Aug  5 14:27:16 2010
New Revision: 982641

URL: http://svn.apache.org/viewvc?rev=982641&view=rev
Log:
No auto retire process 2nd fix

Modified:
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java?rev=982641&r1=982640&r2=982641&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java Thu Aug  5 14:27:16 2010
@@ -331,7 +331,9 @@ public class BpelEngineImpl implements B
                 BpelProcess cachedVersion = processesIter.next();
                 __log.debug("cached version " + cachedVersion.getPID() + " vs registering version " + process.getPID());
                 if (cachedVersion.getProcessType().equals(process.getProcessType())) {
-                    if (!OdeGlobalConfig.autoRetireProcess()) {
+                    if (cachedVersion.getConf().getState() == ProcessState.ACTIVE
+                            && process.getConf().getState() == ProcessState.ACTIVE
+                            && !OdeGlobalConfig.autoRetireProcess()) {
                         throw new ContextException("Can't activate two processes of the same name: " + process.getConf().getPackage() + ", " + cachedVersion.getConf().getPackage() + ", name: " + process.getProcessType());
                     }
                     //Check for versions to retain newer one