svn commit: r1660580 - in /ofbiz/branches/release14.12: ./ framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java

[jacopoc]

Author: jacopoc
Date: Wed Feb 18 09:03:08 2015
New Revision: 1660580

URL: http://svn.apache.org/r1660580
Log:
Applied fix from trunk for revision: 1660579
===

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/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 09:03:08 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579

Modified: ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=1660580&r1=1660579&r2=1660580&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Wed Feb 18 09:03:08 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;