incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1458686 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Date Wed, 20 Mar 2013 08:47:30 GMT
Author: cziegeler
Date: Wed Mar 20 08:47:30 2013
New Revision: 1458686

URL: http://svn.apache.org/r1458686
Log:
SLING-2780 :  Make ResourceMetadata read-only when delivered to client code 

Modified:
    sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java

Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1458686&r1=1458685&r2=1458686&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
(original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Wed Mar 20 08:47:30 2013
@@ -869,7 +869,7 @@ public class ResourceResolverImpl extend
         } else {
             path = parent.getPath() + '/' + childName;
         }
-        Resource child = getResourceInternal(path);
+        Resource child = getResourceInternal( ResourceUtil.normalize(path) );
         if (child != null) {
             final String alias = getProperty(child, PROP_REDIRECT_INTERNAL);
             if (alias != null) {
@@ -895,7 +895,7 @@ public class ResourceResolverImpl extend
                 } else {
                     aliasPath = parent.getPath() + '/' + aliasName;
                 }
-                final Resource aliasedChild = getResourceInternal(aliasPath);
+                final Resource aliasedChild = getResourceInternal( ResourceUtil.normalize(aliasPath)
);
                 logger.debug("getChildInternal: Found Resource {} with alias {} to use",
aliasedChild, childName);
                 return aliasedChild;
             }



Mime
View raw message