You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/02/13 10:12:02 UTC
svn commit: r1659474 -
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Author: tomekr
Date: Fri Feb 13 09:12:02 2015
New Revision: 1659474
URL: http://svn.apache.org/r1659474
Log:
SLING-848 - always set parameterMap with other resourceMetadata
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=1659474&r1=1659473&r2=1659474&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 Fri Feb 13 09:12:02 2015
@@ -332,10 +332,6 @@ public class ResourceResolverImpl extend
}
}
- if (res != null) {
- res.getResourceMetadata().setParameterMap(parsedPath.getParameters());
- }
-
}
// if no resource has been found, use a NonExistingResource
@@ -858,6 +854,7 @@ public class ResourceResolverImpl extend
final String rpi = absPath.substring(curPath.length());
resource.getResourceMetadata().setResolutionPath(absPath.substring(0, curPath.length()));
resource.getResourceMetadata().setResolutionPathInfo(rpi);
+ resource.getResourceMetadata().setParameterMap(parameters);
logger.debug("resolveInternal: Found resource {} with path info {} for {}", new Object[] { resource, rpi, absPath });
@@ -908,6 +905,7 @@ public class ResourceResolverImpl extend
resource.getResourceMetadata().setResolutionPath(path);
resource.getResourceMetadata().setResolutionPathInfo(pathInfo);
+ resource.getResourceMetadata().setParameterMap(parameters);
logger.debug("resolveInternal: Found resource {} with path info {} for {}", new Object[] { resource, pathInfo,
absPath });
@@ -990,6 +988,7 @@ public class ResourceResolverImpl extend
final Resource resource = this.factory.getRootProviderEntry().getResource(this.context, this, path, parameters, isResolve);
if (resource != null) {
resource.getResourceMetadata().setResolutionPath(path);
+ resource.getResourceMetadata().setParameterMap(parameters);
return resource;
}