From a1e4f4f406dda286e9ffe7d35e6324b9e035f6aa Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 12 May 2010 20:15:40 +0000 Subject: [PATCH] MVC mappings properly apply even to welcome file entries that forward to a DispatcherServlet (SPR-7143) --- .../java/org/springframework/web/util/UrlPathHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java index 43059c09c6..c4949ae9e8 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java @@ -158,8 +158,10 @@ public class UrlPathHelper { else { // Special case: URI is different from servlet path. // Can happen e.g. with index page: URI="/", servletPath="/index.html" - // Use servlet path in this case, as it indicates the actual target path. - return servletPath; + // Use path info if available, as it indicates an index page within + // a servlet mapping. Otherwise, use the full servlet path. + String pathInfo = request.getPathInfo(); + return (pathInfo != null ? pathInfo : servletPath); } } -- GitLab