From 4b4dc19e45e30b30e746b9147139c4e56855f9f9 Mon Sep 17 00:00:00 2001
From: Dmytro Myroniuk <dmyroniuk@broadleafcommerce.com>
Date: Tue, 8 Sep 2026 16:33:07 +0300
Subject: [PATCH] Avoid wrapping MVC routing exceptions in
 IllegalStateException to better resolve the root cause of the error in
 com.broadleafcommerce.common.error.validation.web.BroadleafApiMvcErrorController.
 (BroadleafCommerce/MicroPM#7458)

* Example: If the HttpRequestMethodNotSupportedException is thrown, we received a 500 error instead of 405
---
 .../autoconfigure/FrameworkMappingAutoConfiguration.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java b/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
index 5609653..9367e35 100644
--- a/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
+++ b/src/main/java/org/broadleafcommerce/frameworkmapping/autoconfigure/FrameworkMappingAutoConfiguration.java
@@ -55,6 +55,8 @@ protected HandlerMethod handleNoMatch(Set<RequestMappingInfo> infos,
                         boolean hasFrameworkMatch;
                         try {
                             hasFrameworkMatch = frameworkMapping.getHandler(request) != null;
+                        } catch (ServletException e) {
+                            throw e;
                         } catch (Exception e) {
                             throw new IllegalStateException(e);
                         }