From 05b98b0a328236ef8703a3e89ce43c31f6fd383b Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Wed, 7 Jan 2026 15:56:46 +0000 Subject: [PATCH] Suppress API version errors on ERROR dispatch While an API version may be important for mapping in an ERROR dispatch, it is more important to allow the original exception to be handled. Closes gh-36058 --- .../web/servlet/handler/AbstractHandlerMapping.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index d250df937cb..60bf1408044 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -549,7 +549,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport return null; } - if (versionHolder.hasError()) { + if (versionHolder.hasError() && !request.getDispatcherType().equals(DispatcherType.ERROR)) { throw versionHolder.getError(); }