svn commit: r1659965 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java

[adrianc]

Author: adrianc
Date: Sun Feb 15 18:24:51 2015
New Revision: 1659965

URL: http://svn.apache.org/r1659965
Log:
Fix an exception in MacroScreenViewHandler.java - 
https://issues.apache.org/jira/browse/OFBIZ-6074.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java?rev=1659965&r1=1659964&r2=1659965&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
 Sun Feb 15 18:24:51 2015
@@ -112,12 +112,18 @@ public class MacroScreenViewHandler exte
         }
         ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(UtilProperties.getPropertyValue("widget", getName()
                 + ".name"), screenMacroLibraryPath);
-        FormStringRenderer formStringRenderer = new 
MacroFormRenderer(formMacroLibraryPath, request, response);
-        context.put("formStringRenderer", formStringRenderer);
-        TreeStringRenderer treeStringRenderer = new 
MacroTreeRenderer(treeMacroLibraryPath, writer);
-        context.put("treeStringRenderer", treeStringRenderer);
-        MenuStringRenderer menuStringRenderer = new 
MacroMenuRenderer(menuMacroLibraryPath, request, response);
-        context.put("menuStringRenderer", menuStringRenderer);
+        if (!formMacroLibraryPath.isEmpty()) {
+            FormStringRenderer formStringRenderer = new 
MacroFormRenderer(formMacroLibraryPath, request, response);
+            context.put("formStringRenderer", formStringRenderer);
+        }
+        if (!treeMacroLibraryPath.isEmpty()) {
+            TreeStringRenderer treeStringRenderer = new 
MacroTreeRenderer(treeMacroLibraryPath, writer);
+            context.put("treeStringRenderer", treeStringRenderer);
+        }
+        if (!menuMacroLibraryPath.isEmpty()) {
+            MenuStringRenderer menuStringRenderer = new 
MacroMenuRenderer(menuMacroLibraryPath, request, response);
+            context.put("menuStringRenderer", menuStringRenderer);
+        }
         return screenStringRenderer;
     }