Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 21124 invoked from network); 4 May 2010 06:46:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 May 2010 06:46:19 -0000 Received: (qmail 11592 invoked by uid 500); 4 May 2010 06:46:19 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 11531 invoked by uid 500); 4 May 2010 06:46:19 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 11519 invoked by uid 99); 4 May 2010 06:46:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 May 2010 06:46:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Tue, 04 May 2010 06:46:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A2F9D23888FE; Tue, 4 May 2010 06:45:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r940750 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Date: Tue, 04 May 2010 06:45:25 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100504064525.A2F9D23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue May 4 06:45:25 2010 New Revision: 940750 URL: http://svn.apache.org/viewvc?rev=940750&view=rev Log: Fix accidentally changed logic. Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=940750&r1=940749&r2=940750&view=diff ============================================================================== --- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java (original) +++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Tue May 4 06:45:25 2010 @@ -342,8 +342,8 @@ public class SlingServletResolver implem scriptName); } } - } else { - + } + if ( servlet == null ) { // the resource type is not absolute, so lets go for the deep search final NamedScriptResourceCollector locationUtil = NamedScriptResourceCollector.create(scriptName, resource, this.executionPaths); servlet = getServlet(locationUtil, null, resolver); @@ -555,7 +555,8 @@ public class SlingServletResolver implem type); } } - } else { + } + if ( servlet == null ) { // the resource type is not absolute, so lets go for the deep search final ResourceCollector locationUtil = ResourceCollector.create(request, resolver.getWorkspaceName(), this.executionPaths); servlet = getServlet(locationUtil, request, resolver);