Author: fmeschbe
Date: Mon Dec 15 13:37:01 2008
New Revision: 726811
URL: http://svn.apache.org/viewvc?rev=726811&view=rev
Log:
Don't mangle namespaces on absolute url, otherwise an authority part with
port number -- such as //host:55/ -- might be mangled -- such as //_host_55/
-- which is bad ..
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2.java
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2.java?rev=726811&r1=726810&r2=726811&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2.java
(original)
+++
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2.java
Mon Dec 15 13:37:01 2008
@@ -230,13 +230,15 @@
mappedPath = mappedPath.concat(resolutionPathInfo);
}
- // mangle the namespaces
- mappedPath = mangleNamespaces(mappedPath);
-
if (mappedPathIsUrl) {
+ // TODO: Consider mangling the path but not the scheme and
+ // esp. the host:port part
return mappedPath;
}
+ // mangle the namespaces
+ mappedPath = mangleNamespaces(mappedPath);
+
// prepend servlet context path if we have a request
if (request != null && request.getContextPath() != null
&& request.getContextPath().length() > 0) {
