[sling-org-apache-sling-resourcemerger] 09/24: SLING-2986 : Check if resource is hidden through properties (own or parent)

[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.0.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 61a953f93bab35a00a5d8b855e318c6f094d5264
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Jan 29 21:56:27 2014 +0000

    SLING-2986 : Check if resource is hidden through properties (own or parent)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1562606
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/resourcemerger/impl/MergedResourceProvider.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
index 71502f9..d0c3083 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
@@ -87,6 +87,8 @@ public class MergedResourceProvider implements 
ResourceProvider {
                         if ( !hidden ) {
                             // Physical resource exists, add it to the list of 
mapped resources
                             mappedResources.add(0, baseRes.getPath());
+                        } else {
+                            mappedResources.clear();
                         }
                     }
                 }

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