svn commit: r1660579 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java

[ja...@apache.org]

Author: jacopoc
Date: Wed Feb 18 09:02:15 2015
New Revision: 1660579

URL: http://svn.apache.org/r1660579
Log:
OFBIZ-6071: fix for issue in decrypting entity fields (encrypt="true" in entity definition) in tenant mode. Thanks to Deepak Dixit and Rohit Koushal for the report, the fix and the tests.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=1660579&r1=1660578&r2=1660579&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Wed Feb 18 09:02:15 2015
@@ -171,6 +171,7 @@ public class EntityListIterator implemen
         if (closed) throw new GenericResultSetClosedException("This EntityListIterator has been closed, this operation cannot be performed");
 
         GenericValue value = GenericValue.create(modelEntity);
+        value.setDelegator(this.delegator);
 
         for (int j = 0; j < selectFields.size(); j++) {
             ModelField curField = selectFields.get(j);
@@ -178,7 +179,6 @@ public class EntityListIterator implemen
             SqlJdbcUtil.getValue(resultSet, j + 1, curField, value, modelFieldTypeReader);
         }
 
-        value.setDelegator(this.delegator);
         value.synchronizedWithDatasource();
         this.haveMadeValue = true;
         return value;