You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/27 15:39:23 UTC

svn commit: r1716881 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Author: markt
Date: Fri Nov 27 14:39:23 2015
New Revision: 1716881

URL: http://svn.apache.org/viewvc?rev=1716881&view=rev
Log:
ServletPath is never null but it might be zero length.

Modified:
    tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1716881&r1=1716880&r2=1716881&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Fri Nov 27 14:39:23 2015
@@ -350,11 +350,11 @@ public class DefaultServlet extends Http
         }
 
         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('/');



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