This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new cdc5d65725 Fix likely NPE in trace log
cdc5d65725 is described below
commit cdc5d657250118656cb70c5e1cea3c663b042c2e
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 23880e5eb5..27900a77b9 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2015,7 +2015,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]
