svn commit: r1811169 - /sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java

[cziegeler]

Author: cziegeler
Date: Thu Oct  5 08:27:12 2017
New Revision: 1811169

URL: http://svn.apache.org/viewvc?rev=1811169&view=rev
Log:
SLING-6878 : Bundle resource provider: support mounting of JSON files

Modified:
    
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java

Modified: 
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java?rev=1811169&r1=1811168&r2=1811169&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
 (original)
+++ 
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
 Thu Oct  5 08:27:12 2017
@@ -151,16 +151,17 @@ public class BundleResource extends Abst
         this.subResources = children;
     }
 
-    Resource getChildResource(String path) {
+    Resource getChildResource(final String path) {
         Resource result = null;
         Map<String, Map<String, Object>> resources = this.subResources;
+        String subPath = null;
         for(String segment : path.split("/")) {
             if ( resources != null ) {
-                path = path.concat("/").concat(segment);
+                subPath = subPath == null ? segment : 
subPath.concat("/").concat(segment);
                 final Map<String, Object> props = resources.get(segment);
                 if ( props != null ) {
                     result = new BundleResource(this.resourceResolver, 
this.cache, this.mappedPath,
-                            path, props, false);
+                            this.getPath().concat("/").concat(subPath), props, 
false);
                     resources = ((BundleResource)result).subResources;
                 } else {
                     result = null;