This is an automated email from the ASF dual-hosted git repository.
remm 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 10c1b3e4d7 Fix likely NPE in trace log
10c1b3e4d7 is described below
commit 10c1b3e4d74dd319a6957e14f8e37dc4402f515c
Author: remm <[email protected]>
AuthorDate: Fri Jul 4 15:55:03 2025 +0200
Fix likely NPE in trace log
Found by coverity.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index ded4594c3b..b1d6d28444 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2000,7 +2000,7 @@ public class DefaultServlet extends HttpServlet {
}
IOException e = copyRange(reader, new PrintWriter(buffer));
if (debug > 10) {
- log("readme '" + readmeFile + "' output error: " +
e.getMessage());
+ log("readme '" + readmeFile + "' output error: " + ((e
!= null) ? e.getMessage() : ""));
}
} catch (IOException e) {
log(sm.getString("defaultServlet.readerCloseFailed"), e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
