You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/12/29 11:24:15 UTC
svn commit: r1426736 - in /ofbiz/branches/release12.04: ./
framework/widget/src/org/ofbiz/widget/WidgetWorker.java
Author: jleroux
Date: Sat Dec 29 10:24:15 2012
New Revision: 1426736
URL: http://svn.apache.org/viewvc?rev=1426736&view=rev
Log:
"Applied fix from trunk for revision: 1426734"
------------------------------------------------------------------------
r1426734 | jleroux | 2012-12-29 11:02:15 +0100 (sam., 29 déc. 2012) | 7 lines
A patch from Olivier Heintz for "My Portal Preferences error" https://issues.apache.org/jira/browse/OFBIZ-5073
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)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1426734
Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1426736&r1=1426735&r2=1426736&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sat Dec 29 10:24:15 2012
@@ -289,7 +289,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\"/>");