From e49869ea78c1571e4f854350777018f22ea4ee28 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 25 Sep 2009 10:34:54 +0000
Subject: [PATCH] SPR-6148 - @ResponseBody with returned String results in
 unresolvable view ServletException

---
 .../servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java   | 1 +
 1 file changed, 1 insertion(+)

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
index 081eaab5a4..4a8353b41c 100644
--- 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 class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
 
 			if (returnValue != null && AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {
 				handleResponseBody(returnValue, webRequest);
+				return null;
 			}
 
 			if (returnValue instanceof ModelAndView) {