svn commit: r1661292 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java

[ashish-18]

Author: ashish
Date: Sat Feb 21 06:59:57 2015
New Revision: 1661292

URL: http://svn.apache.org/r1661292
Log:
Applied patch from jira issue - OFBIZ-4977 - Limitation and issue with delegator.findByPrimaryKeyPartial method :  returns error when partialKeyset contains PK value.
Thanks Sumit for creating the issue and providing the patch for the same. Thanks Arun for the verification.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1661292&r1=1661291&r2=1661292&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Sat Feb 21 06:59:57 2015
@@ -563,9 +563,9 @@ public class GenericDAO {
 
         Set<String> tempKeys = new TreeSet<String>(keys);
 
-        Iterator<ModelField> nopkIter = modelEntity.getNopksIterator();
-        while (nopkIter.hasNext()) {
-            ModelField curField = nopkIter.next();
+        Iterator<ModelField> entityFieldIter = modelEntity.getFieldsIterator();
+        while (entityFieldIter.hasNext()) {
+            ModelField curField = entityFieldIter.next();
             if (tempKeys.contains(curField.getName())) {
                 partialFields.add(curField);
                 tempKeys.remove(curField.getName());