Ensure method & requestURI are non-null in MHSR

sbrannen · sbrannen · commit ec5d81e78e79 · 2013-06-09T12:42:00.000+02:00
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
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -249,8 +249,8 @@ public MockHttpServletRequest(ServletContext servletContext) {
 	 */
 	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 @@ else if (value != null) {
 	}
 
 	public void setMethod(String method) {
-		this.method = method;
+		this.method = (method == null ? "" : method);
 	}
 
 	@Override
@@ -937,7 +937,7 @@ public String getRequestedSessionId() {
 	}
 
 	public void setRequestURI(String requestURI) {
-		this.requestURI = requestURI;
+		this.requestURI = (requestURI == null ? "" : requestURI);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,8 @@ public MockHttpServletRequest(ServletContext servletContext) {`
`249`	`249`	`*/`
`250`	`250`	`public MockHttpServletRequest(ServletContext servletContext, String method, String requestURI) {`
`251`	`251`	`this.servletContext = (servletContext != null ? servletContext : new MockServletContext());`
`252`		`- this.method = method;`
`253`		`- this.requestURI = requestURI;`
	`252`	`+ this.method = (method == null ? "" : method);`
	`253`	`+ this.requestURI = (requestURI == null ? "" : requestURI);`
`254`	`254`	`this.locales.add(Locale.ENGLISH);`
`255`	`255`	`}`
`256`	`256`
`@@ -859,7 +859,7 @@ else if (value != null) {`
`859`	`859`	`}`
`860`	`860`
`861`	`861`	`public void setMethod(String method) {`
`862`		`- this.method = method;`
	`862`	`+ this.method = (method == null ? "" : method);`
`863`	`863`	`}`
`864`	`864`
`865`	`865`	`@Override`
`@@ -937,7 +937,7 @@ public String getRequestedSessionId() {`
`937`	`937`	`}`
`938`	`938`
`939`	`939`	`public void setRequestURI(String requestURI) {`
`940`		`- this.requestURI = requestURI;`
	`940`	`+ this.requestURI = (requestURI == null ? "" : requestURI);`
`941`	`941`	`}`
`942`	`942`
`943`	`943`	`@Override`