From 9944b57de305ebad4abb6d289cfa338571b85521 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 22 May 2009 10:52:10 +0000 Subject: [PATCH] SPR-5768 - Rearrange logic in ServletHandlerMethodInvoker.getModelAndView() --- .../annotation/AnnotationMethodHandlerAdapter.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 4283f73b6f..8f11cb0d87 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 @@ -699,6 +699,13 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen ExtendedModelMap implicitModel, 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... if (customModelAndViewResolvers != null) { 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) { ModelAndView mav = (ModelAndView) returnValue;