svn commit: r1782525 - /ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java

Author: jleroux
Date: Fri Feb 10 20:48:16 2017
New Revision: 1782525

URL: http://svn.apache.org/viewvc?rev=1782525&view=rev
Log:
"Applied fix from trunk for revision: 1782498" (conflicts handled by hand)
------------------------------------------------------------------------
r1782498 | jleroux | 2017-02-10 19:46:04 +0100 (ven. 10 févr. 2017) | 11 lignes

Fixed: SimpleMethod: FindByAnd never using EntityListIterator
(OFBIZ-9152)

Since the introduction of EntityQuery there was no distinction between a simple
method tags
<find-by-and use-iterator="true"> and <find-by-and use-iterator="false">
(except cache handling).
There is a condition "if (useIterator)" but with entityQueries did use
"[...].queryList()".

Thanks: Mirko Vogelsmeier
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java

Modified: ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=1782525&r1=1782524&r2=1782525&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/branches/release15.12/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Fri Feb 10 20:48:16 2017
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
 /**
  * Implements the &lt;find-by-and&gt; element.
  *
- * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cfindbyand%3E}}">Mini-language Reference</a>
+ * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class FindByAnd extends EntityOperation {
 
@@ -90,7 +90,7 @@ public final class FindByAnd extends Ent
                                                                   .from(entityName)
                                                                   .where(whereCond)
                                                                   .orderBy(orderByNames)
-                                                                  .queryList());
+                                                                  .queryIterator());
             } else {
                 listFma.put(methodContext.getEnvMap(), EntityQuery.use(delegator)
                                                                   .select(UtilMisc.toSet(fieldsToSelectListFma.get(methodContext.getEnvMap())))