You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2015/01/19 23:38:05 UTC
svn commit: r1653144 -
/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
Author: justin
Date: Mon Jan 19 22:38:04 2015
New Revision: 1653144
URL: http://svn.apache.org/r1653144
Log:
SLING-4311 - edge case where reusing an hidden ancestor name caused the wrong resource to be hidden
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java?rev=1653144&r1=1653143&r2=1653144&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java Mon Jan 19 22:38:04 2015
@@ -81,8 +81,8 @@ class MergingResourceProvider implements
}
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) {