This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3a17b1d94c Fix BZ 69471
3a17b1d94c is described below
commit 3a17b1d94cf6c06828c887952d8bdfbc61741622
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 22 18:42:27 2024 +0000
Fix BZ 69471
Log instances of CloseNowException caught by
ApplicationDispatcher.invoke() at debug level rather than error level as
they are very likely to have been caused by a client disconnection or
similar I/O issue.
https://bz.apache.org/bugzilla/show_bug.cgi?id=69471
---
java/org/apache/catalina/core/ApplicationDispatcher.java | 3 ++-
webapps/docs/changelog.xml | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 22f0d439a2..7bd141bcfd 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -43,6 +43,7 @@ import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.Response;
import org.apache.catalina.connector.ResponseFacade;
import org.apache.coyote.BadRequestException;
+import org.apache.coyote.CloseNowException;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -538,7 +539,7 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
filterChain.doFilter(request, response);
}
// Servlet Service Method is called by the FilterChain
- } catch (BadRequestException e) {
+ } catch (BadRequestException | CloseNowException e) {
ioException = e;
} catch (IOException e) {
wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException",
wrapper.getName()), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 483a041a28..a635e7b3b4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,12 @@
some headers, as per RFC 9110, section 9.3.2, that are present in a GET
request that are not present in the equivalent HEAD request. (markt)
</fix>
+ <fix>
+ <bug>69471</bug>: Log instances of <code>CloseNowException</code>
caught
+ by <code>ApplicationDispatcher.invoke()</code> at debug level rather
+ than error level as they are very likely to have been caused by a
client
+ disconnection or similar I/O issue. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
