SPR-7233 - ResponseEntity having body, headers and HttpStatus mixed up in responseEntity.getBody()

poutsma · poutsma · commit d0393ea109b6 · 2010-05-28T08:07:21.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
@@ -839,12 +839,12 @@ public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Obj
 				}
 			}
 
-			if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {
-				handleResponseBody(returnValue, webRequest);
+			if (returnValue instanceof HttpEntity) {
+				handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest);
 				return null;
 			}
-			else if (returnValue instanceof HttpEntity) {
-				handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest);
+			else if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {
+				handleResponseBody(returnValue, webRequest);
 				return null;
 			}
 			else if (returnValue instanceof ModelAndView) {

Original file line number	Diff line number	Diff line change
`@@ -839,12 +839,12 @@ public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Obj`
`839`	`839`	`}`
`840`	`840`	`}`
`841`	`841`
`842`		`- if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {`
`843`		`- handleResponseBody(returnValue, webRequest);`
	`842`	`+ if (returnValue instanceof HttpEntity) {`
	`843`	`+ handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest);`
`844`	`844`	`return null;`
`845`	`845`	`}`
`846`		`- else if (returnValue instanceof HttpEntity) {`
`847`		`- handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest);`
	`846`	`+ else if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {`
	`847`	`+ handleResponseBody(returnValue, webRequest);`
`848`	`848`	`return null;`
`849`	`849`	`}`
`850`	`850`	`else if (returnValue instanceof ModelAndView) {`