svn commit: r1782499 - in /ofbiz/branches/release16.11: ./ framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java

Author: jleroux
Date: Fri Feb 10 18:46:30 2017
New Revision: 1782499

URL: http://svn.apache.org/viewvc?rev=1782499&view=rev
Log:
"Applied fix from trunk for revision: 1782498"
------------------------------------------------------------------------
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/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 18:46:30 2017
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979
+/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498

Modified: ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java?rev=1782499&r1=1782498&r2=1782499&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java Fri Feb 10 18:46:30 2017
@@ -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())))