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

SPR-5768 - Rearrange logic in ServletHandlerMethodInvoker.getModelAndView()

This commit is contained in:
Arjen Poutsma 2009-05-22 10:52:10 +00:00
parent d7d1ae89f3
commit 9944b57de3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,6 +699,13 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
ExtendedModelMap implicitModel, ExtendedModelMap implicitModel,
ServletWebRequest webRequest) { ServletWebRequest webRequest) {
if (handlerMethod.isAnnotationPresent(ResponseStatus.class)) {
ResponseStatus responseStatus = handlerMethod.getAnnotation(ResponseStatus.class);
HttpServletResponse response = webRequest.getResponse();
response.setStatus(responseStatus.value().value());
responseArgumentUsed = true;
}
// Invoke custom resolvers if present... // Invoke custom resolvers if present...
if (customModelAndViewResolvers != null) { if (customModelAndViewResolvers != null) {
for (ModelAndViewResolver mavResolver : customModelAndViewResolvers) { for (ModelAndViewResolver mavResolver : customModelAndViewResolvers) {
@ -709,12 +716,6 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
} }
} }
} }
if (handlerMethod.isAnnotationPresent(ResponseStatus.class)) {
ResponseStatus responseStatus = handlerMethod.getAnnotation(ResponseStatus.class);
HttpServletResponse response = webRequest.getResponse();
response.setStatus(responseStatus.value().value());
responseArgumentUsed = true;
}
if (returnValue instanceof ModelAndView) { if (returnValue instanceof ModelAndView) {
ModelAndView mav = (ModelAndView) returnValue; ModelAndView mav = (ModelAndView) returnValue;