You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2009/12/03 13:27:52 UTC

svn commit: r886759 - /ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java

Author: vanto
Date: Thu Dec  3 12:27:51 2009
New Revision: 886759

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

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

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java?rev=886759&r1=886758&r2=886759&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java (original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java Thu Dec  3 12:27:51 2009
@@ -66,7 +66,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);
     }
@@ -104,7 +104,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("}"));