svn commit: r886757 - /ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java

[vanto]

Author: vanto
Date: Thu Dec  3 12:21:01 2009
New Revision: 886757

URL: http://svn.apache.org/viewvc?rev=886757&view=rev
Log:
ODE-727 fixing criteria builder for multiple instance id selection.

Modified:
    
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java

Modified: 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java?rev=886757&r1=886756&r2=886757&view=diff
==============================================================================
--- 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
 (original)
+++ 
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
 Thu Dec  3 12:21:01 2009
@@ -61,7 +61,7 @@
     if (iids != null && iids.size() > 0) {
         Disjunction disj = Restrictions.disjunction();
         for (String iid: iids) {
-            crit.add(Restrictions.eq("id", new Long(iid)));
+            disj.add(Restrictions.eq("id", new Long(iid)));
         }
         crit.add(disj);
     }
@@ -99,7 +99,7 @@
     // Specific filter for correlation properties
     if (filter.getPropertyValuesFilter() != null) {
       Criteria propCrit = 
crit.createCriteria("correlationSets").createCriteria("properties");
-      for (Map.Entry corValue : filter.getPropertyValuesFilter().entrySet()) {
+      for (Map.Entry<String, String> corValue : 
filter.getPropertyValuesFilter().entrySet()) {
         String propName = (String)corValue.getKey();
         if (propName.startsWith("{")) {
           String namespace = propName.substring(1, propName.lastIndexOf("}"));