diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index 2a723d7b2cf..231d287b01b 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -20,7 +20,7 @@ Changes in version 3.1.1 (2012-02-06) * Hibernate 4 LocalSessionFactoryBean does not insist on a "dataSource" reference being set * added "entityInterceptor" property to Hibernate 4 LocalSessionFactoryBean * corrected fix for QuartzJobBean to work with Quartz 2.0/2.1 - +* Make AbstractHandlerMethodExceptionResolver an abstract class Changes in version 3.1 GA (2011-12-12) -------------------------------------- diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java index edf5a770f19..4481118b3c2 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java @@ -23,13 +23,14 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.ModelAndView; /** - * Abstract base class for {@link org.springframework.web.servlet.HandlerExceptionResolver HandlerExceptionResolver} - * implementations that support handling exceptions from {@link HandlerMethod}s rather than handlers. + * Abstract base class for + * {@link org.springframework.web.servlet.HandlerExceptionResolver HandlerExceptionResolver} + * implementations that support handling exceptions from handlers of type {@link HandlerMethod}. * * @author Rossen Stoyanchev * @since 3.1 */ -public class AbstractHandlerMethodExceptionResolver extends AbstractHandlerExceptionResolver { +public abstract class AbstractHandlerMethodExceptionResolver extends AbstractHandlerExceptionResolver { /** * Checks if the handler is a {@link HandlerMethod} instance and performs the check against the bean @@ -52,10 +53,10 @@ public class AbstractHandlerMethodExceptionResolver extends AbstractHandlerExcep } @Override - protected final ModelAndView doResolveException(HttpServletRequest request, - HttpServletResponse response, - Object handler, - Exception ex) { + protected final ModelAndView doResolveException( + HttpServletRequest request, HttpServletResponse response, + Object handler, Exception ex) { + return doResolveHandlerMethodException(request, response, (HandlerMethod) handler, ex); } @@ -73,11 +74,8 @@ public class AbstractHandlerMethodExceptionResolver extends AbstractHandlerExcep * @param ex the exception that got thrown during handler execution * @return a corresponding ModelAndView to forward to, or null for default processing */ - protected ModelAndView doResolveHandlerMethodException(HttpServletRequest request, - HttpServletResponse response, - HandlerMethod handlerMethod, - Exception ex) { - return null; - } - + protected abstract ModelAndView doResolveHandlerMethodException( + HttpServletRequest request, HttpServletResponse response, + HandlerMethod handlerMethod, Exception ex); + }