Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 81779 invoked from network); 21 Jul 2010 20:48:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Jul 2010 20:48:34 -0000 Received: (qmail 37924 invoked by uid 500); 21 Jul 2010 20:48:34 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 37882 invoked by uid 500); 21 Jul 2010 20:48:34 -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 37875 invoked by uid 99); 21 Jul 2010 20:48:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 20:48:34 +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; Wed, 21 Jul 2010 20:48:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D3E0E2388A36; Wed, 21 Jul 2010 20:47:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r966412 - /sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java Date: Wed, 21 Jul 2010 20:47:08 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100721204708.D3E0E2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Wed Jul 21 20:47:08 2010 New Revision: 966412 URL: http://svn.apache.org/viewvc?rev=966412&view=rev Log: SLING-1610 - adding check for mapped path Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java?rev=966412&r1=966411&r2=966412&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java (original) +++ sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererServlet.java Wed Jul 21 20:47:08 2010 @@ -123,7 +123,7 @@ public class StreamRendererServlet exten } else { // the resource is the root, do not redirect, immediately index - if ("/".equals(resource.getPath())) { + if (isRootResourceRequest(resource)) { renderDirectory(request, response, included); @@ -146,6 +146,11 @@ public class StreamRendererServlet exten } } + private boolean isRootResourceRequest(Resource resource) { + return ("/".equals(resource.getPath())) || + ("/".equals(resource.getResourceResolver().map(resource.getPath()))); + } + /** * Returns true if the request has a * If-Modified-Since header whose date value is later than the