root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Arjen Poutsma 2010-05-28 08:07:21 +00:00
parent 75c5405d6f
commit d0393ea109
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -839,12 +839,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
} }
} }
if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) { if (returnValue instanceof HttpEntity) {
handleResponseBody(returnValue, webRequest); handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest);
return null; return null;
} }
else if (returnValue instanceof HttpEntity) { else if (AnnotationUtils.findAnnotation(handlerMethod, ResponseBody.class) != null) {
handleHttpEntityResponse((HttpEntity<?>) returnValue, webRequest); handleResponseBody(returnValue, webRequest);
return null; return null;
} }
else if (returnValue instanceof ModelAndView) { else if (returnValue instanceof ModelAndView) {