svn commit: r661759 - in /ode/trunk: bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java

[mriou]

Author: mriou
Date: Fri May 30 08:22:58 2008
New Revision: 661759

URL: http://svn.apache.org/viewvc?rev=661759&view=rev
Log:
ODE-192 Delete instance call on Management API fails.

Modified:
    
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
    
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java

Modified: 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?rev=661759&r1=661758&r2=661759&view=diff
==============================================================================
--- 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
 (original)
+++ 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
 Fri May 30 08:22:58 2008
@@ -417,7 +417,7 @@
     public Collection<Long> delete(String filter) {
         final InstanceFilter instanceFilter = new InstanceFilter(filter);
 
-        List<Long> ret = new LinkedList<Long>();
+        final List<Long> ret = new LinkedList<Long>();
         try {
 
             _db.exec(new BpelDatabase.Callable<Object>() {
@@ -425,6 +425,7 @@
                     Collection<ProcessInstanceDAO> instances = 
conn.instanceQuery(instanceFilter);
                     for (ProcessInstanceDAO instance : instances) {
                         instance.delete();
+                        ret.add(instance.getInstanceId());
                     }
                     return null;
                 }

Modified: 
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java?rev=661759&r1=661758&r2=661759&view=diff
==============================================================================
--- 
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
 (original)
+++ 
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
 Fri May 30 08:22:58 2008
@@ -95,7 +95,7 @@
        private FaultDAOImpl _fault;
        @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) 
@Column(name="PROCESS_ID")
        private ProcessDAOImpl _process;
-       @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) 
@Column(name="INSTANTIATING_CORRELATOR_ID")
+       @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) 
@Column(name="INSTANTIATING_CORRELATOR_ID")
        private CorrelatorDAOImpl _instantiatingCorrelator;
        
        public ProcessInstanceDAOImpl() {}