You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/21 17:54:56 UTC

svn commit: r424364 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java

Author: pcl
Date: Fri Jul 21 08:54:56 2006
New Revision: 424364

URL: http://svn.apache.org/viewvc?rev=424364&view=rev
Log:
fixed in-mem distinct evaluation of single results

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java?rev=424364&r1=424363&r2=424364&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java Fri Jul 21 08:54:56 2006
@@ -58,12 +58,10 @@
         if (candidate == null)
             candidate = Collections.EMPTY_LIST;
         
-        // ### should arg be used in eval below?
         Collection arg = candidate instanceof Collection
             ? (Collection) candidate : Collections.singleton(candidate);
 
-        return eval((Collection) candidate, orig, ctx, params).
-            iterator().next();
+        return eval(arg, orig, ctx, params).iterator().next();
     }
 
     protected Collection eval(Collection candidates, Object orig,