litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r6017 from nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-10-04 13:40:43 +00:00
parent e9bff81937
commit 881c937594
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
View file

@ -166,11 +166,13 @@ public class URLRewritingHttpServletResponse implements HttpServletResponse {
url.pathParts.add(localName); url.pathParts.add(localName);
// remove the ugly uri parameter // remove the ugly uri parameter
indexToRemove = qpIndex; indexToRemove = qpIndex;
// namespace returned from URIImpl.getNamespace() ends in a slash, so will
// match externally linked namespaces, which also end in a slash
} else if (isExternallyLinkedNamespace(namespace)) { } else if (isExternallyLinkedNamespace(namespace)) {
log.debug("Found externally linked namespace " + namespace); log.debug("Found externally linked namespace " + namespace);
// Use the externally linked namespace in the url // Use the externally linked namespace in the url
url.pathParts = new ArrayList<String>(); url.pathParts = new ArrayList<String>();
// toString() will join elements with a slash, so remove this one. // toString() will join pathParts with a slash, so remove this one.
url.pathParts.add(namespace.replaceAll("/$", "")); url.pathParts.add(namespace.replaceAll("/$", ""));
url.pathParts.add(localName); url.pathParts.add(localName);
// remove the ugly uri parameter // remove the ugly uri parameter