Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 38411 invoked from network); 11 Jun 2007 22:19:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jun 2007 22:19:57 -0000 Received: (qmail 75345 invoked by uid 500); 11 Jun 2007 22:19:58 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 75307 invoked by uid 500); 11 Jun 2007 22:19:57 -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 75281 invoked by uid 99); 11 Jun 2007 22:19:57 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2007 15:19:57 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Mon, 11 Jun 2007 15:19:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 587831A981A; Mon, 11 Jun 2007 15:19:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r546305 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Date: Mon, 11 Jun 2007 22:19:31 -0000 To: commits@roller.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070611221931.587831A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: agilliland Date: Mon Jun 11 15:19:30 2007 New Revision: 546305 URL: http://svn.apache.org/viewvc?view=rev&rev=546305 Log: fixing NPE thrown when roller session is null. Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=546305&r1=546304&r2=546305 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Mon Jun 11 15:19:30 2007 @@ -139,7 +139,7 @@ try { RollerSession rses = RollerSession.getRollerSession(mRequest); - if ( rses.getAuthenticatedUser() != null + if ( rses != null && rses.getAuthenticatedUser() != null && mWebsite != null) { return rses.isUserAuthorizedToAdmin(mWebsite); }