Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid sendError call when response committed already (Tomcat 10.1.16)

Browse Source 
Closes gh-32206

(cherry picked from commit 4ed337247c)
This commit is contained in:
Juergen Hoeller
2024-02-06 16:46:04 +01:00
parent 5f13ea95fb
commit 5434edd726
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -464,8 +464,8 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
response.sendError(status);
}
}
else {
logger.warn("Ignoring exception, response committed. : " + errorResponse);
else if (logger.isWarnEnabled()) {
logger.warn("Ignoring exception, response committed already: " + errorResponse);
}
return new ModelAndView();
@@ -524,14 +524,19 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
protected ModelAndView handleHttpMessageNotReadable(HttpMessageNotReadableException ex,
HttpServletRequest request, HttpServletResponse response, @Nullable Object handler) throws IOException {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
if (!response.isCommitted()) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
}
else if (logger.isWarnEnabled()) {
logger.warn("Ignoring exception, response committed already: " + ex);
}
return new ModelAndView();
}
/**
* Handle the case where a
* {@linkplain org.springframework.http.converter.HttpMessageConverter message converter}
* cannot write to an HTTP request.
* cannot write to an HTTP response.
* <p>The default implementation sends an HTTP 500 error, and returns an empty {@code ModelAndView}.
* Alternatively, a fallback view could be chosen, or the HttpMessageNotWritableException could
* be rethrown as-is.
@@ -545,7 +550,12 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
protected ModelAndView handleHttpMessageNotWritable(HttpMessageNotWritableException ex,
HttpServletRequest request, HttpServletResponse response, @Nullable Object handler) throws IOException {
sendServerError(ex, request, response);
if (!response.isCommitted()) {
sendServerError(ex, request, response);
}
else if (logger.isWarnEnabled()) {
logger.warn("Ignoring exception, response committed already: " + ex);
}
return new ModelAndView();
}