Author: mykee
Date: Wed Jun 19 16:06:00 2013
New Revision: 1494674
URL: http://svn.apache.org/r1494674
Log:
SLING-2916, SLING-2922 NPE problem in RootResourceProviderEntry
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java?rev=1494674&r1=1494673&r2=1494674&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java
Wed Jun 19 16:06:00 2013
@@ -137,8 +137,6 @@ public class RootResourceProviderEntry e
private ProviderHandler actProviderHandler;
- private ResourceResolverContext rrCtx = ctx;
-
private Resource seek() {
Resource result = null;
if ( nextResourceIter == null || !nextResourceIter.hasNext() )
{
@@ -146,7 +144,7 @@ public class RootResourceProviderEntry e
while ( i.hasNext() && nextResourceIter == null ) {
final QueriableResourceProvider adap = i.next();
nextResourceIter = adap.findResources(resolver, query,
language);
- actProviderHandler =
queriableProviders.getProviderHandler(rrCtx, adap);
+ actProviderHandler =
queriableProviders.getProviderHandler(ctx, adap);
}
}
if ( nextResourceIter != null ) {
