I assume this means we should cancel the vote of 1.2.2? Regards Carsten
Am 19.01.15 um 14:28 schrieb [email protected]: > Author: justin > Date: Mon Jan 19 22:28:47 2015 > New Revision: 1653137 > > URL: http://svn.apache.org/r1653137 > 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 > > sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.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=1653137&r1=1653136&r2=1653137&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:28:47 2015 > @@ -95,6 +95,7 @@ class MergingResourceProvider implements > } > } > } > + previousAncestorName = ancestor.getName(); > ancestor = ancestor.getParent(); > } > } > > Modified: > sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java > URL: > http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java?rev=1653137&r1=1653136&r2=1653137&view=diff > ============================================================================== > --- > sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java > (original) > +++ > sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java > Mon Jan 19 22:28:47 2015 > @@ -55,6 +55,7 @@ public class OverridingResourceProviderT > * /apps/a/1/d > * /apps/a/1/d/1 > * /apps/a/1/d/1/a > + * /apps/a/1/d/1/b/1 > * /apps/a/1/c > * /apps/a/2/c > * > @@ -76,6 +77,8 @@ public class OverridingResourceProviderT > .resource("/apps/a/1/d").p("a", "1").p("b", "2") > .resource("1").p("1", "a").p("2", "b") > .resource("a") > + .resource("/apps/a/1/d/1/b") > + .resource("1") > .resource("/apps/a/1/c").p("1", "a").p("2", "b") > .resource("/apps/a/2").p(SUPER_TYPE, "a/1").p("b", > "2").p(MergedResourceConstants.PN_HIDE_CHILDREN, new String[] {"b"}) > .resource("c").p("1", "c") > @@ -122,6 +125,9 @@ public class OverridingResourceProviderT > assertNotNull(this.provider.getResource(this.resolver, > "/override/apps/a/1/b/1")); > assertNull(this.provider.getResource(this.resolver, > "/override/apps/a/2/b")); > assertNull(this.provider.getResource(this.resolver, > "/override/apps/a/2/b/1")); > + assertNotNull(this.provider.getResource(this.resolver, > "/override/apps/a/2/d/1/a")); > + assertNotNull(this.provider.getResource(this.resolver, > "/override/apps/a/2/d/1/b")); > + assertNotNull(this.provider.getResource(this.resolver, > "/override/apps/a/2/d/1/b/1")); > } > > // doing it this way because the mock resource resolver doesn't > > > -- Carsten Ziegeler Adobe Research Switzerland [email protected]
