From 882f8cfce536ff57f0de59c5fdd89356ef7379c8 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 28 May 2010 08:07:21 +0000 Subject: [PATCH] SPR-7233 - ResponseEntity having body, headers and HttpStatus mixed up in responseEntity.getBody() git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3376 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../mvc/annotation/AnnotationMethodHandlerAdapter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 9853e06c40f..54ec61078a9 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 @@ -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) {