You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2015/02/21 08:01:51 UTC
svn commit: r1661293 -
/ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
Author: ashish
Date: Sat Feb 21 07:01:51 2015
New Revision: 1661293
URL: http://svn.apache.org/r1661293
Log:
Applied bug fix from trunk r1661292.
===========================================================================
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/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
Modified: ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1661293&r1=1661292&r2=1661293&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/branches/release14.12/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Sat Feb 21 07:01:51 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());