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

[spring-projects-issues]

Kenny MacLeod opened SPR-5768 and commented

In ServletHandlerMethodInvoker.getModelAndView(), the presense of a custom ModelAndViewResolver is checked for before the presense of @ResponseStatus on the handler method. If ModelAndViewResolver resolves, then getModelAndView() exits immediately, before the @ResponseStatus is checked and the status set accordingly.

I suggest that the order here be reversed, checking for the annotation first, since the annotation on the controller is more specific than the ModelAndViewResolver, which is context-wide. Additionally, this would allow REST applications to specify a custom ModelAndViewResolver for rendering POJO return values, whilst still using @ResponseStatus on the controller.

---

Affects: 3.0 M3