From d1b0bdb3d558410a735f43741f36febd4d7f9f01 Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Wed, 4 Feb 2026 14:53:07 +0100
Subject: [PATCH] Revert Servlet TRACE error dispatch workaround

Closes gh-36258
---
 .../org/springframework/web/servlet/FrameworkServlet.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 6563aa7bdfb..65644b09fbc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -971,10 +971,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic
 				return;
 			}
 		}
-		// Work around until https://github.com/jakartaee/servlet/pull/545 is fixed and in use
-		if (request.getDispatcherType() != DispatcherType.ERROR) {
-			super.doTrace(request, response);
-		}
+		super.doTrace(request, response);
 	}
 
 	/**