Minor fix in ServletResponseMethodArgumentResolver

Issues: SPR-8983
costin · Feb 15, 2012 · a3484ae · a3484ae
1 parent 6fd476e
commit a3484ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...ingframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java b/...ingframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
@@ -61,8 +61,10 @@ public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
 			throws IOException {
-
-		mavContainer.setRequestHandled(true);
+
+		if (mavContainer != null) {
+			mavContainer.setRequestHandled(true);
+		}
 
 		HttpServletResponse response = webRequest.getNativeResponse(HttpServletResponse.class);
 		Class<?> paramType = parameter.getParameterType();

diff --git a/...amework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/...amework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
@@ -70,6 +70,16 @@ public void servletResponse() throws Exception {
 		assertTrue(mavContainer.isRequestHandled());
 	}
 
+	// SPR-8983
+
+	public void servletResponseNoMavContainer() throws Exception {
+		MethodParameter servletResponseParameter = new MethodParameter(method, 0);
+		assertTrue("ServletResponse not supported", resolver.supportsParameter(servletResponseParameter));
+
+		Object result = resolver.resolveArgument(servletResponseParameter, null, webRequest, null);
+		assertSame("Invalid result", servletResponse, result);
+	}
+
 	@Test
 	public void outputStream() throws Exception {
 		MethodParameter outputStreamParameter = new MethodParameter(method, 1);