svn commit: r1649747 - in /ofbiz/branches/release14.12: ./ framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

[jacopoc]

Author: jacopoc
Date: Tue Jan  6 07:56:28 2015
New Revision: 1649747

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

OFBIZ-5944: before trying to pull the values for the form's fields, check if the key exists in order to avoid an IllegalArgumentException if the map is a GenericEntity. Thanks to Christian Carlow for the report and to Deepak Dixit for the research and useful comments.


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  6 07:56:28 2015
@@ -8,3 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
+/ofbiz/trunk:1649742

Modified: ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1649747&r1=1649746&r2=1649747&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Tue Jan  6 07:56:28 2015
@@ -289,7 +289,6 @@ public class ModelFormField {
             }
             Object retVal = null;
             if (UtilValidate.isNotEmpty(this.entryAcsr)) {
-                //Debug.logInfo("Getting entry, using entryAcsr for field " + this.getName() + " of form " + this.modelForm.getName(), module);
                 if (dataMap instanceof GenericEntity) {
                     GenericEntity genEnt = (GenericEntity) dataMap;
                     if (genEnt.getModelEntity().isField(this.entryAcsr.getOriginalName())) {
@@ -301,9 +300,10 @@ public class ModelFormField {
                     retVal = this.entryAcsr.get(dataMap, locale);
                 }
             } else {
-                //Debug.logInfo("Getting entry, no entryAcsr so using field name " + this.name + " for field " + this.getName() + " of form " + this.modelForm.getName(), module);
                 // if no entry name was specified, use the field's name
-                retVal = dataMap.get(this.name);
+                if (dataMap.containsKey(this.name)) {
+                    retVal = dataMap.get(this.name);
+                }
             }
 
             // this is a special case to fill in fields during a create by default from parameters passed in