sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject [sling-org-apache-sling-api] branch master updated: SLING-7593 : ResourceTraversor doesn't support ResourceDecorator pattern. Apply patch from Joanna Jasnowska
Date Tue, 24 Apr 2018 17:42:18 GMT
This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 292c461  SLING-7593 : ResourceTraversor doesn't support ResourceDecorator pattern.
Apply patch from Joanna Jasnowska
292c461 is described below

commit 292c461f6223865026c8522ac5167a042a168854
Author: Carsten Ziegeler <cziegele@adobe.com>
AuthorDate: Tue Apr 24 19:42:11 2018 +0200

    SLING-7593 : ResourceTraversor doesn't support ResourceDecorator pattern. Apply patch
from Joanna Jasnowska
---
 src/main/java/org/apache/sling/api/resource/ResourceUtil.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/sling/api/resource/ResourceUtil.java b/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
index 02d4739..315355e 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
@@ -373,12 +373,7 @@ public class ResourceUtil {
      */
     @Deprecated
     public static @Nonnull Iterator<Resource> listChildren(@Nonnull Resource parent)
{
-        /*
-         * Same as AbstractResource.listChildren() implementation to prevent
-         * problems if there are implementations of the pre-2.1.0 Resource
-         * interface in the framework.
-         */
-        return parent.getResourceResolver().listChildren(parent);
+        return parent.listChildren();
     }
 
     /**
@@ -471,9 +466,9 @@ public class ResourceUtil {
      * to go up the resource super type hierarchy.
      *
      * In case the type of the given resource or the given resource type starts with one
of the resource resolver's search paths
-     * it is converted to a relative resource type by stripping off the resource resolver's
search path 
+     * it is converted to a relative resource type by stripping off the resource resolver's
search path
      * before doing the comparison.
-     * 
+     *
      * @param resource the resource to check
      * @param resourceType the resource type to check the resource against
      * @return <code>false</code> if <code>resource</code> is <code>null</code>.

-- 
To stop receiving notification emails like this one, please contact
cziegeler@apache.org.

Mime
View raw message