(tomcat) branch 9.0.x updated: Fix potential NPE

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 2297c68d46 Fix potential NPE
2297c68d46 is described below

commit 2297c68d46ec907b3d74ca023ee6dffa4ee52406
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 20 17:38:54 2024 +0000

    Fix potential NPE
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 28d54bab07..7d90a48ca7 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1747,8 +1747,13 @@ public class DefaultServlet extends HttpServlet {
 
         StringBuilder sb = new StringBuilder();
 
-        // Get the right strings
-        StringManager sm = 
StringManager.getManager(DefaultServlet.class.getPackage().getName(), 
request.getLocales());
+        // Get the right strings if request is available
+        StringManager sm;
+        if (request == null) {
+            sm = DefaultServlet.sm;
+        } else {
+            sm = 
StringManager.getManager(DefaultServlet.class.getPackage().getName(), 
request.getLocales());
+        }
 
         String directoryWebappPath = resource.getWebappPath();
         WebResource[] entries = resources.listResources(directoryWebappPath);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org