svn commit: r1478495 - /ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java

[as...@apache.org]

Author: ashish
Date: Thu May  2 19:12:29 2013
New Revision: 1478495

URL: http://svn.apache.org/r1478495
Log:
Applied bug fix from trunk r1426734. For more details please refer jira issue - https://issues.apache.org/jira/browse/OFBIZ-5073.
My Portal Preferences error:
Select My Portal > Preferences, displays bellow error.
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://common/widget/CommonScreens.xml#GlobalDecorator: java.lang.NullPointerException (null)
Reverting org/ofbiz/widget/WidgetWorker.java previous latest OFBIZ-2628 bug fix, then the problem recovered.

Modified:
    ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java

Modified: ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1478495&r1=1478494&r2=1478495&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Thu May  2 19:12:29 2013
@@ -288,7 +288,7 @@ public class WidgetWorker {
             writer.append(key);
             writer.append("\" value=\"");
 
-            String valueFromContext = context.containsKey(key) ?
+            String valueFromContext = context.containsKey(key) && context.get(key) != null ?
                     context.get(key).toString() : parameter.getValue();
             writer.append(valueFromContext);
             writer.append("\" type=\"hidden\"/>");