root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Ensure method & requestURI are non-null in MHSR 

Prior to this commit it was possible for the method and requestURI
fields in MockHttpServletRequest to be set to null.

This commit ensures that the method and requestURI fields are internally
stored as empty strings if the user sets them to a null value.

Issue: SPR-10643
This commit is contained in:
Sam Brannen 2013-06-09 12:42:00 +02:00
parent 86591e5e5a
commit ec5d81e78e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@ -249,8 +249,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
*/
public MockHttpServletRequest(ServletContext servletContext, String method, String requestURI) {
this.servletContext = (servletContext != null ? servletContext : new MockServletContext());
this.method = method;
this.requestURI = requestURI;
this.method = (method == null ? "" : method);
this.requestURI = (requestURI == null ? "" : requestURI);
this.locales.add(Locale.ENGLISH);
}
@ -859,7 +859,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
}
public void setMethod(String method) {
this.method = method;
this.method = (method == null ? "" : method);
}
@Override
@ -937,7 +937,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
}
public void setRequestURI(String requestURI) {
this.requestURI = requestURI;
this.requestURI = (requestURI == null ? "" : requestURI);
}
@Override