You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/12/17 21:43:40 UTC
svn commit: r604995 - in
/ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa:
CorrelatorDAOImpl.java MessageRouteDAOImpl.java
Author: mriou
Date: Mon Dec 17 12:43:39 2007
New Revision: 604995
URL: http://svn.apache.org/viewvc?rev=604995&view=rev
Log:
Routes were not deleted...
Modified:
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
Modified: ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java?rev=604995&r1=604994&r2=604995&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java Mon Dec 17 12:43:39 2007
@@ -42,7 +42,7 @@
@Entity
@Table(name="ODE_CORRELATOR")
-public class CorrelatorDAOImpl implements CorrelatorDAO {
+public class CorrelatorDAOImpl extends OpenJPADAO implements CorrelatorDAO {
@Id @Column(name="CORRELATOR_ID")
@GeneratedValue(strategy=GenerationType.AUTO)
@@ -109,9 +109,10 @@
void removeLocalRoutes(String routeGroupId, ProcessInstanceDAO target) {
for (Iterator itr=_routes.iterator(); itr.hasNext(); ) {
MessageRouteDAOImpl mr = (MessageRouteDAOImpl)itr.next();
- if ( mr.getGroupId().equals(routeGroupId) &&
- mr.getTargetInstance().equals(target))
+ if ( mr.getGroupId().equals(routeGroupId) && mr.getTargetInstance().equals(target)) {
itr.remove();
+ getEM().remove(mr);
+ }
}
}
}
Modified: ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java?rev=604995&r1=604994&r2=604995&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java (original)
+++ ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java Mon Dec 17 12:43:39 2007
@@ -62,8 +62,12 @@
_processInst = processInst;
_correlator = correlator;
}
-
- public CorrelationKey getCorrelationKey() {
+
+ public Long getId() {
+ return _id;
+ }
+
+ public CorrelationKey getCorrelationKey() {
return new CorrelationKey(_correlationKey);
}