From 881c9375940a9766d16dbc452994744641e1584a Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 4 Oct 2010 13:40:43 +0000 Subject: [PATCH] Merge r6017 from nihvivo-rel-1.1-maint --- .../vitro/webapp/filters/URLRewritingHttpServletResponse.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java index 928db1f44..1d83dcbfc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java @@ -166,11 +166,13 @@ public class URLRewritingHttpServletResponse implements HttpServletResponse { url.pathParts.add(localName); // remove the ugly uri parameter 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)) { log.debug("Found externally linked namespace " + namespace); // Use the externally linked namespace in the url url.pathParts = new ArrayList(); - // 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(localName); // remove the ugly uri parameter