You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by my...@apache.org on 2014/09/14 13:04:27 UTC
svn commit: r1624835 -
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/RootResourceProviderEntry.java
Author: mykee
Date: Sun Sep 14 11:04:26 2014
New Revision: 1624835
URL: http://svn.apache.org/r1624835
Log:
SLING-3931 - ResourceResolver can run into a stack overflow in findResources
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=1624835&r1=1624834&r2=1624835&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 Sun Sep 14 11:04:26 2014
@@ -151,9 +151,9 @@ public class RootResourceProviderEntry e
if ( nextResourceIter != null ) {
while ( nextResourceIter.hasNext() && result == null ) {
result = nextResourceIter.next();
- }
- if ( actProviderHandler != null ) {
- result = actProviderHandler.getReadableResource(ctx, result);
+ if ( actProviderHandler != null ) {
+ result = actProviderHandler.getReadableResource(ctx, result);
+ }
}
if ( result == null ) {
result = seek();