svn commit: r1729537 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java

[cziegeler]

Author: cziegeler
Date: Wed Feb 10 07:12:45 2016
New Revision: 1729537

URL: http://svn.apache.org/viewvc?rev=1729537&view=rev
Log:
SLING-5499 : Servlets resource provider is hiding resources from other providers

Modified:
    
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java

Modified: 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java?rev=1729537&r1=1729536&r2=1729537&view=diff
==============================================================================
--- 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
 (original)
+++ 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
 Wed Feb 10 07:12:45 2016
@@ -52,7 +52,8 @@ public class ServletResourceProvider ext
 
         final ResourceProvider parentProvider = 
ctx.getParentResourceProvider();
         if ( parentProvider != null ) {
-            return parentProvider.getResource(ctx.getParentResolveContext(), 
path, resourceContext, parent);
+            final Resource useParent = (parent instanceof ServletResource ? 
null : parent);
+            return parentProvider.getResource(ctx.getParentResolveContext(), 
path, resourceContext, useParent);
         }
         return null;
     }