spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity

MVC mappings properly apply even to welcome file entries that forward to a DispatcherServlet (SPR-7143)

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3325 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller
2010-05-12 20:15:40 +00:00
parent 220d5a0e15
commit 2472c22298
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+4 -2
View File
@@ -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);
}
}