svn commit: r897088 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

[jonesde]

Author: jonesde
Date: Fri Jan  8 04:11:35 2010
New Revision: 897088

URL: http://svn.apache.org/viewvc?rev=897088&view=rev
Log:
Made gathering info for Artifact Info more resilient to incomplete form defs

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

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=897088&r1=897087&r2=897088&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Fri Jan  8 04:11:35 2010
@@ -2918,14 +2918,20 @@
         if (this.actions != null) {
             for (ModelFormAction modelFormAction: this.actions) {
                 if (modelFormAction instanceof ModelFormAction.Service) {
-                    allServiceNamesUsed.add(((ModelFormAction.Service)modelFormAction).serviceNameExdr.getOriginal());
+                    String serviceName = ((ModelFormAction.Service) modelFormAction).serviceNameExdr.getOriginal();
+                    if (serviceName != null) {
+                        allServiceNamesUsed.add(serviceName);
+                    }
                 }
             }
         }
         if (this.rowActions != null) {
             for (ModelFormAction modelFormAction: this.rowActions) {
                 if (modelFormAction instanceof ModelFormAction.Service) {
-                    allServiceNamesUsed.add(((ModelFormAction.Service)modelFormAction).serviceNameExdr.getOriginal());
+                    String serviceName = ((ModelFormAction.Service) modelFormAction).serviceNameExdr.getOriginal();
+                    if (serviceName != null) {
+                        allServiceNamesUsed.add(serviceName);
+                    }
                 }
             }
         }