You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/08/13 17:08:30 UTC
svn commit: r565372 - in
/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa:
CorrelatorDAOImpl.java ProcessDAOImpl.java
Author: mszefler
Date: Mon Aug 13 08:08:29 2007
New Revision: 565372
URL: http://svn.apache.org/viewvc?view=rev&rev=565372
Log:
Applied changeset 564394 from BART branch (fix correlator route removal
isssue). This should fix ODE-137.
Modified:
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java?view=diff&rev=565372&r1=565371&r2=565372
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java Mon Aug 13 08:08:29 2007
@@ -57,8 +57,9 @@
private ProcessDAOImpl _process;
public CorrelatorDAOImpl(){}
- public CorrelatorDAOImpl(String correlatorKey) {
+ public CorrelatorDAOImpl(String correlatorKey, ProcessDAOImpl process) {
_correlatorKey = correlatorKey;
+ _process = process;
}
public void addRoute(String routeGroupId, ProcessInstanceDAO target, int index, CorrelationKey correlationKey) {
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java?view=diff&rev=565372&r1=565371&r2=565372
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java Mon Aug 13 08:08:29 2007
@@ -48,8 +48,13 @@
@Entity
@Table(name="ODE_PROCESS")
@NamedQueries({
- @NamedQuery(name="InstanceByCKey", query="SELECT cs._scope._processInstance FROM CorrelationSetDAOImpl as cs WHERE cs._correlationKey = :ckey"),
- @NamedQuery(name="CorrelatorByKey", query="SELECT c FROM CorrelatorDAOImpl as c WHERE c._correlatorKey = :ckey")
+ @NamedQuery(name="InstanceByCKey", query="SELECT cs._scope._processInstance " +
+ "FROM CorrelationSetDAOImpl as cs " +
+ "WHERE cs._correlationKey = :ckey"),
+
+ @NamedQuery(name="CorrelatorByKey", query="SELECT c " +
+ "FROM CorrelatorDAOImpl as c" +
+ " WHERE c._correlatorKey = :ckey AND c._process = :process")
})
public class ProcessDAOImpl extends OpenJPADAO implements ProcessDAO {
@@ -80,7 +85,7 @@
}
public CorrelatorDAO addCorrelator(String correlator) {
- CorrelatorDAOImpl corr = new CorrelatorDAOImpl(correlator);
+ CorrelatorDAOImpl corr = new CorrelatorDAOImpl(correlator, this);
_correlators.add(corr);
return corr;
}
@@ -88,6 +93,7 @@
public CorrelatorDAO getCorrelator(String correlatorId) {
Query qry = getEM().createNamedQuery("CorrelatorByKey");
qry.setParameter("ckey", correlatorId);
+ qry.setParameter("process", this);
List res = qry.getResultList();
if (res.size() == 0) return null;
return (CorrelatorDAO) res.get(0);