svn commit: r736075 - in /ode/branches/APACHE_ODE_1.X: bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java

[seanahn]

Author: seanahn
Date: Tue Jan 20 11:28:06 2009
New Revision: 736075

URL: http://svn.apache.org/viewvc?rev=736075&view=rev
Log:
ODE-480, Regarding to Jacob data on-the-fly cleanup, there's a chance that you 
would see an error message from the log that does not affect the actual 
functionality

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=736075&r1=736074&r2=736075&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
 Tue Jan 20 11:28:06 2009
@@ -33,6 +33,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.common.ProcessState;
 import org.apache.ode.bpel.dao.BpelDAOConnection;
 import org.apache.ode.bpel.dao.ProcessDAO;
 import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -416,6 +417,11 @@
                         if (__log.isDebugEnabled()) {
                             __log.debug("Matcher event for iid " + 
we.getIID());
                         }
+                        if( procInstance.getState() == 
ProcessState.STATE_COMPLETED_OK 
+                                       || procInstance.getState() == 
ProcessState.STATE_COMPLETED_WITH_FAULT ) {
+                               __log.debug("A matcher event was aborted. The 
process is already completed.");
+                               return;
+                        }
                         processInstance.matcherEvent(we.getCorrelatorId(), 
we.getCorrelationKeySet());
                 }
             }

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?rev=736075&r1=736074&r2=736075&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 Tue Jan 20 11:28:06 2009
@@ -327,6 +327,7 @@
       
          if( _instance.getJacobState() != null ) {
                  getSession().delete(_instance.getJacobState());
+                 _instance.setJacobState(null);
          }
          
       if( cleanupCategories.contains(CLEANUP_CATEGORY.EVENTS) ) {