svn commit: r778907 - in /ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel: ProcessDaoImpl.java ProcessInstanceDaoImpl.java

[mriou]

Author: mriou
Date: Tue May 26 21:57:54 2009
New Revision: 778907

URL: http://svn.apache.org/viewvc?rev=778907&view=rev
Log:
Commenting a couple of broken cleanup deletes until they're fixed.

Modified:
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?rev=778907&r1=778906&r2=778907&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
 Tue May 26 21:57:54 2009
@@ -111,7 +111,8 @@
     public ProcessInstanceDAO createInstance(CorrelatorDAO correlator) {
         entering("ProcessDaoImpl.createInstance");
         HProcessInstance instance = new HProcessInstance();
-        
instance.setInstantiatingCorrelator((HCorrelator)((CorrelatorDaoImpl)correlator).getHibernateObj());
+        if (correlator != null)
+            
instance.setInstantiatingCorrelator((HCorrelator)((CorrelatorDaoImpl)correlator).getHibernateObj());
         instance.setProcess(_process);
         instance.setCreated(new Date());
         getSession().save(instance);
@@ -194,10 +195,10 @@
     private void deleteMessages() {
         
getSession().getNamedQuery(HCorrelatorMessage.DELETE_CORMESSAGES_BY_PROCESS).setParameter
 ("process", _process).executeUpdate();
 
-        
getSession().getNamedQuery(HLargeData.DELETE_MESSAGE_LDATA_BY_PROCESS).setParameter("process",
 _process).setParameter ("process2", _process).executeUpdate();
+//        
getSession().getNamedQuery(HLargeData.DELETE_MESSAGE_LDATA_BY_PROCESS).setParameter("process",
 _process).setParameter ("process2", _process).executeUpdate();
         
getSession().getNamedQuery(HMessage.DELETE_REQUEST_MESSAGES_BY_PROCESS).setParameter("process",
 _process).executeUpdate();
         
getSession().getNamedQuery(HMessage.DELETE_RESPONSE_MESSAGES_BY_PROCESS).setParameter("process",
 _process).executeUpdate();
-        
getSession().getNamedQuery(HMessageExchangeProperty.DELETE_MEX_PROPS_BY_PROCESS).setParameter("process",
 _process).executeUpdate();
+//        
getSession().getNamedQuery(HMessageExchangeProperty.DELETE_MEX_PROPS_BY_PROCESS).setParameter("process",
 _process).executeUpdate();
         
getSession().getNamedQuery(HLargeData.DELETE_MEX_LDATA_BY_PROCESS).setParameter("process",
 _process).setParameter("process2", _process).executeUpdate();
         
getSession().getNamedQuery(HMessageExchange.DELETE_MEX_BY_PROCESS).setParameter("process",
 _process).executeUpdate();
         
getSession().getNamedQuery(HCorrelator.DELETE_CORRELATORS_BY_PROCESS).setParameter("process",
 _process).executeUpdate();

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?rev=778907&r1=778906&r2=778907&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 Tue May 26 21:57:54 2009
@@ -382,7 +382,7 @@
     @SuppressWarnings("unchecked")
     private void deleteMessages() {
         // there are chances that some unmatched messages are still there
-        
getSession().getNamedQuery(HLargeData.DELETE_UNMATCHED_MESSAGE_LDATA_BY_INSTANCE).setParameter("instance",
 _instance).executeUpdate();
+//        
getSession().getNamedQuery(HLargeData.DELETE_UNMATCHED_MESSAGE_LDATA_BY_INSTANCE).setParameter("instance",
 _instance).executeUpdate();
         Collection unmatchedMex = 
getSession().getNamedQuery(HMessageExchange.SELECT_UNMATCHED_MEX_BY_INSTANCE).setParameter("instance",
 _instance).list();
         if( !unmatchedMex.isEmpty() ) {
             
getSession().getNamedQuery(HMessageExchange.DELETE_UNMATCHED_MEX).setParameter("mex",
 unmatchedMex).executeUpdate();