svn commit: r654155 - /ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java

[mriou]

Author: mriou
Date: Wed May  7 08:45:38 2008
New Revision: 654155

URL: http://svn.apache.org/viewvc?rev=654155&view=rev
Log:
Better selector filtering.

Modified:
    
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java

Modified: 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java?rev=654155&r1=654154&r2=654155&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
 Wed May  7 08:45:38 2008
@@ -56,7 +56,7 @@
 
     /** filter for finding a matching selector. */
     private static final String FLTR_SELECTORS = ("from " + 
HCorrelatorSelector.class.getName()
-            + " hs where hs.correlationKey = ? and hs.processType = 
?").intern();
+            + " hs where hs.correlationKey = ? and hs.processType = ? and 
hs.correlator.correlatorId = ?").intern();
 
     private static final String LOCK_SELECTORS = "update from " + 
HCorrelatorSelector.class.getName() +
         " set lock = lock+1 where correlationKey = ? and processType = 
?".intern();
@@ -122,6 +122,7 @@
             Query q = getSession().createQuery(FLTR_SELECTORS);
             q.setString(0, key == null ? null : key.toCanonicalString());
             q.setString(1, processType);
+            q.setString(2, _hobj.getCorrelatorId());
             q.setLockMode("hs", LockMode.UPGRADE);
 
             HCorrelatorSelector selector;