You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/01/29 22:56:28 UTC
svn commit: r1562606 -
/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
Author: cziegeler
Date: Wed Jan 29 21:56:27 2014
New Revision: 1562606
URL: http://svn.apache.org/r1562606
Log:
SLING-2986 : Check if resource is hidden through properties (own or parent)
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java?rev=1562606&r1=1562605&r2=1562606&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java Wed Jan 29 21:56:27 2014
@@ -87,6 +87,8 @@ public class MergedResourceProvider impl
if ( !hidden ) {
// Physical resource exists, add it to the list of mapped resources
mappedResources.add(0, baseRes.getPath());
+ } else {
+ mappedResources.clear();
}
}
}