svn commit: r1669588 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java

[deepak]

Author: deepak
Date: Fri Mar 27 13:44:45 2015
New Revision: 1669588

URL: http://svn.apache.org/r1669588
Log:
Fixed NPE while rendering content using screen widget, if content.dataResouceId 
is null then ModelScreenWidget throwing NPW. 
Applied patch from jira issue OFBIZ-6219

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java?rev=1669588&r1=1669587&r2=1669588&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java 
Fri Mar 27 13:44:45 2015
@@ -1387,7 +1387,7 @@ public abstract class ModelScreenWidget
                         return;
                     }
                     if (content != null) {
-                        expandedDataResourceId = 
content.getString("dataResourceId");
+                        if (content.get("dataResourceId") != null) 
expandedDataResourceId = content.getString("dataResourceId");
                     } else {
                         String errMsg = "Could not find content with contentId 
[" + expandedContentId + "] ";
                         Debug.logError(errMsg, module);