Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 84825 invoked from network); 14 Jan 2008 14:25:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2008 14:25:42 -0000 Received: (qmail 9284 invoked by uid 500); 14 Jan 2008 14:25:32 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 9246 invoked by uid 500); 14 Jan 2008 14:25:31 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 9237 invoked by uid 99); 14 Jan 2008 14:25:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 06:25:31 -0800 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; Mon, 14 Jan 2008 14:25:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1C7211A9832; Mon, 14 Jan 2008 06:25:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r611812 - /incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Date: Mon, 14 Jan 2008 14:25:15 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080114142517.1C7211A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Mon Jan 14 06:25:13 2008 New Revision: 611812 URL: http://svn.apache.org/viewvc?rev=611812&view=rev Log: Avoid NPE in resolveServletOrScript if Resource is null (might happen while handling errors) Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=611812&r1=611811&r2=611812&view=diff ============================================================================== --- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original) +++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Mon Jan 14 06:25:13 2008 @@ -238,6 +238,11 @@ Servlet resolveServletOrScript(SlingHttpServletRequest request) { + // if handling errors, resource might be null + if(request.getResource() == null) { + return null; + } + // get the servlet by resource type Servlet servlet = getServlet(request.getResource().getResourceType()); if (servlet != null) {