Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 571D2EF57 for ; Sat, 29 Dec 2012 10:24:41 +0000 (UTC) Received: (qmail 67144 invoked by uid 500); 29 Dec 2012 10:24:40 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 66877 invoked by uid 500); 29 Dec 2012 10:24:40 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 66830 invoked by uid 99); 29 Dec 2012 10:24:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2012 10:24:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_BELOW2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2012 10:24:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E655423888D2; Sat, 29 Dec 2012 10:24:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1426736 - in /ofbiz/branches/release12.04: ./ framework/widget/src/org/ofbiz/widget/WidgetWorker.java Date: Sat, 29 Dec 2012 10:24:15 -0000 To: commits@ofbiz.apache.org From: jleroux@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121229102415.E655423888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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\"/>");