Author: cziegeler Date: Thu Sep 15 12:19:34 2016 New Revision: 1760923 URL: http://svn.apache.org/viewvc?rev=1760923&view=rev Log: Use ResourceUtil.normalize to support dot as name
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java?rev=1760923&r1=1760922&r2=1760923&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java Thu Sep 15 12:19:34 2016 @@ -76,7 +76,7 @@ public class ConfigurationResourceResolv List<String> getResolvePaths(final Resource contentResource) { final List<String> refPaths = new ArrayList<>(); - + // add all config references found in resource hierarchy final List<ConfigReference> refs = new ArrayList<>(); findConfigRefs(refs, contentResource); @@ -207,7 +207,7 @@ public class ConfigurationResourceResolv // strategy: find first item among all configured paths int idx = 1; for (final String path : getResolvePaths(contentResource)) { - final Resource item = contentResource.getResourceResolver().getResource(path + "/" + name); + final Resource item = contentResource.getResourceResolver().getResource(ResourceUtil.normalize(path + "/" + name)); if (item != null) { logger.debug("Resolved config item at [{}]: {}", idx, item.getPath()); @@ -236,7 +236,7 @@ public class ConfigurationResourceResolv final List<Resource> result = new ArrayList<>(); int idx = 1; for (String path : this.getResolvePaths(contentResource)) { - Resource item = contentResource.getResourceResolver().getResource(path + "/" + name); + Resource item = contentResource.getResourceResolver().getResource(ResourceUtil.normalize(path + "/" + name)); if (item != null) { if (logger.isTraceEnabled()) { logger.trace("+ resolved config item at [{}]: {}", idx, item.getPath());