root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
rstoyanchev 2023-10-24 12:58:31 +01:00
parent 3f8bbdb116 4dab35205d
commit 2864c12887
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
View File

@ -982,7 +982,10 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic
return; 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);
}
} }
/** /**