[riftsaw-commits] riftsaw SVN: r937 - branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel.

[riftsaw-commits at lists.jboss.org]

Author: jeff.yuchang
Date: 2010-09-07 02:37:03 -0400 (Tue, 07 Sep 2010)
New Revision: 937

Modified:
   branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java
Log:
* RIFTSAW-278, use instanceId to do the comparison.


Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java	2010-09-07 06:32:12 UTC (rev 936)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java	2010-09-07 06:37:03 UTC (rev 937)
@@ -173,7 +173,7 @@
         boolean flush = false;
         for (Iterator<MessageRouteDAOImpl> itr = _routes.iterator(); itr.hasNext();) {
             MessageRouteDAOImpl mr = itr.next();
-            if (mr.getGroupId().equals(routeGroupId) && mr.getTargetInstance().equals(target)) {
+            if (mr.getGroupId().equals(routeGroupId) && mr.getTargetInstance().getInstanceId().equals(target.getInstanceId())) {
                 if (__log.isDebugEnabled()) {
                     __log.debug("removing " + mr.getCorrelationKey() + " " + mr.getIndex() + " " + mr.getRoute());
                 }