Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPR-8596 Detect case in UriPathHelper where originating request query (before forwarding) is null.

Browse Source
This commit is contained in:
Rossen Stoyanchev
2011-08-31 13:00:24 +00:00
parent ce70c985b4
commit 7bf44f06a0
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java
View File

@@ -287,14 +287,15 @@ public class UrlPathHelper {
* @return the query string
*/
public String getOriginatingQueryString(HttpServletRequest request) {
String queryString = (String) request.getAttribute(WebUtils.FORWARD_QUERY_STRING_ATTRIBUTE);
if (queryString == null) {
queryString = request.getQueryString();
if ((request.getAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE) != null) ||
(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null)) {
return (String) request.getAttribute(WebUtils.FORWARD_QUERY_STRING_ATTRIBUTE);
}
else {
return request.getQueryString();
}
return queryString;
}
/**
* Decode the supplied URI string and strips any extraneous portion after a ';'.
*/