Merge branch '6.0.x'

rstoyanchev · rstoyanchev · commit 2864c12887f8 · 2023-10-24T12:58:31.000+01:00
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
@@ -982,7 +982,10 @@ protected void doTrace(HttpServletRequest request, HttpServletResponse response)
 				return;
 			}
 		}
-		super.doTrace(request, response);
+		// Work around until https://github.com/jakartaee/servlet/pull/545 is fixed and in use
+		if (request.getDispatcherType() != DispatcherType.ERROR) {
+			super.doTrace(request, response);
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,10 @@ protected void doTrace(HttpServletRequest request, HttpServletResponse response)`
`982`	`982`	`return;`
`983`	`983`	`}`
`984`	`984`	`}`
`985`		`- super.doTrace(request, response);`
	`985`	`+ // Work around until https://github.com/jakartaee/servlet/pull/545 is fixed and in use`
	`986`	`+ if (request.getDispatcherType() != DispatcherType.ERROR) {`
	`987`	`+ super.doTrace(request, response);`
	`988`	`+ }`
`986`	`989`	`}`
`987`	`990`
`988`	`991`	`/**`