SPR-6148 - @responsebody with returned String results in unresolvable view ServletException

poutsma · poutsma · commit e49869ea78c1 · 2009-09-25T10:34:54.000Z
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -731,6 +731,7 @@ public ModelAndView getModelAndView(Method handlerMethod,
 
 			if (returnValue != null && AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {
 				handleResponseBody(returnValue, webRequest);
+				return null;
 			}
 
 			if (returnValue instanceof ModelAndView) {

Original file line number	Diff line number	Diff line change
`@@ -731,6 +731,7 @@ public ModelAndView getModelAndView(Method handlerMethod,`
`731`	`731`
`732`	`732`	`if (returnValue != null && AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {`
`733`	`733`	`handleResponseBody(returnValue, webRequest);`
	`734`	`+ return null;`
`734`	`735`	`}`
`735`	`736`
`736`	`737`	`if (returnValue instanceof ModelAndView) {`