svn commit: r1096140 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Author: jleroux
Date: Sat Apr 23 13:07:21 2011
New Revision: 1096140

URL: http://svn.apache.org/viewvc?rev=1096140&view=rev
Log:
A patch from Nicolas Malin "getImageLocation generates NullPointer" https://issues.apache.org/jira/browse/OFBIZ-4262

When you use auto-field-entity on a form , you get a nullPointer :

java.lang.NullPointerException
org.ofbiz.widget.form.ModelFormField$DisplayField.getImageLocation(ModelFormField.java:2122)
org.ofbiz.widget.form.MacroFormRenderer.renderDisplayField(MacroFormRenderer.java:193)
org.ofbiz.widget.form.ModelFormField$DisplayField.renderFieldString(ModelFormField.java:2104)
org.ofbiz.widget.form.ModelFormField.renderFieldString(ModelFormField.java:600)
org.ofbiz.widget.form.ModelForm.renderItemRow(ModelForm.java:1707)


Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1096140&r1=1096139&r2=1096140&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sat Apr 23 13:07:21 2011
@@ -2119,7 +2119,11 @@ public class ModelFormField {
         }
 
         public String getImageLocation(Map<String, Object> context){
-            return this.imageLocation.expandString(context);
+            if (this.imageLocation != null) {
+                return this.imageLocation.expandString(context);
+            } else {
+                return "";
+            }
         }
 
         public String getDescription(Map<String, Object> context) {