ServletPath is never null but it might be zero length.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1716881 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 27, 2015 · 24c8d8c · 24c8d8c
1 parent 39c521c
commit 24c8d8c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -350,11 +350,11 @@ protected String getRelativePath(HttpServletRequest request) {
         }
 
         StringBuilder result = new StringBuilder();
-        if (servletPath != null) {
+        if (servletPath.length() > 0) {
             result.append(servletPath);
-            if (pathInfo != null) {
-                result.append(pathInfo);
-            }
+        }
+        if (pathInfo != null) {
+            result.append(pathInfo);
         }
         if (result.length() == 0) {
             result.append('/');