Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 24418 invoked from network); 7 Aug 2007 12:59:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Aug 2007 12:59:37 -0000 Received: (qmail 11530 invoked by uid 500); 7 Aug 2007 12:59:36 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 11514 invoked by uid 500); 7 Aug 2007 12:59:36 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 11505 invoked by uid 99); 7 Aug 2007 12:59:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2007 05:59:36 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2007 12:59:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8C2C51A981F; Tue, 7 Aug 2007 05:59:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r563482 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Date: Tue, 07 Aug 2007 12:59:09 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070807125909.8C2C51A981F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Tue Aug 7 05:59:08 2007 New Revision: 563482 URL: http://svn.apache.org/viewvc?view=rev&rev=563482 Log: Fixes http://opensource.atlassian.com/projects/roller/browse/ROL-1509 NPE in preview, fixed by adding null check around requestParameters reference Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=563482&r1=563481&r2=563482 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Tue Aug 7 05:59:08 2007 @@ -305,9 +305,11 @@ * Get request parameter by name. */ public String getRequestParameter(String paramName) { - String[] values = (String[])requestParameters.get(paramName); - if (values != null && values.length > 0) { - return values[0]; + if (requestParameters != null) { + String[] values = (String[])requestParameters.get(paramName); + if (values != null && values.length > 0) { + return values[0]; + } } return null; }