From 8c0e6beb43cc372347e55f42e3842756ca783ead Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Sun, 8 Jun 2014 11:49:45 -0400 Subject: [PATCH] Fix corner case for javadoc redirector --- .../google/zxing/web/LegacyJavadocRedirectServlet.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zxingorg/src/main/java/com/google/zxing/web/LegacyJavadocRedirectServlet.java b/zxingorg/src/main/java/com/google/zxing/web/LegacyJavadocRedirectServlet.java index 3aada2dba..e5169a12d 100644 --- a/zxingorg/src/main/java/com/google/zxing/web/LegacyJavadocRedirectServlet.java +++ b/zxingorg/src/main/java/com/google/zxing/web/LegacyJavadocRedirectServlet.java @@ -25,15 +25,18 @@ import javax.servlet.http.HttpServletResponse; public final class LegacyJavadocRedirectServlet extends HttpServlet { - private static final String PREFIX = "/w/docs/javadoc/"; + private static final String PREFIX = "/w/docs/javadoc"; @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) { String requestURI = request.getRequestURI(); Preconditions.checkArgument(requestURI.startsWith(PREFIX)); - String redirectURI = "http://zxing.github.io/zxing/apidocs/" + requestURI.substring(PREFIX.length()); + String requestWithoutPrefix = requestURI.substring(PREFIX.length()); + if (requestWithoutPrefix.isEmpty()) { + requestWithoutPrefix = "/"; + } response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader(HttpHeaders.LOCATION, redirectURI); + response.setHeader(HttpHeaders.LOCATION, "http://zxing.github.io/zxing/apidocs" + requestWithoutPrefix); } }