[sling-org-apache-sling-resourcemerger] 08/31: SLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resource to be hidden

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.10
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 91be8e73677878e9a77f0d993b8a70aa36781c00
Author: Justin Edelson <jus...@apache.org>
AuthorDate: Mon Jan 19 22:38:04 2015 +0000

    SLING-4311 - edge case where reusing an hidden ancestor name caused the 
wrong resource to be hidden
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1653144
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/resourcemerger/impl/MergingResourceProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
index 4a8200c..82a9f91 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
@@ -81,8 +81,8 @@ class MergingResourceProvider implements ResourceProvider {
             }
             if (parent != null) {
                 Resource ancestor = parent.getParent();
+                String previousAncestorName = parent.getName();
                 while (ancestor != null) {
-                    String previousAncestorName = parent.getName();
                     final ValueMap ancestorProps = 
ResourceUtil.getValueMap(ancestor);
                     final String[] ancestorChildrenToHideArray = 
ancestorProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, String[].class);
                     if (ancestorChildrenToHideArray != null) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.