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

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;