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

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

@@ -839,12 +839,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 				}
 			}
 
-			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) {