Author: violetagg
Date: Fri Jan 1 21:05:20 2016
New Revision: 1722574
URL: http://svn.apache.org/viewvc?rev=1722574&view=rev
Log:
The variable cannot be null but empty string
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1722574&r1=1722573&r2=1722574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Fri Jan 1
21:05:20 2016
@@ -1541,7 +1541,7 @@ public class Response
String contextPath = getContext().getPath();
if (contextPath != null) {
String file = url.getFile();
- if ((file == null) || !file.startsWith(contextPath)) {
+ if (!file.startsWith(contextPath)) {
return false;
}
String tok = ";" +
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1722574&r1=1722573&r2=1722574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Jan 1
21:05:20 2016
@@ -1048,7 +1048,7 @@ public final class CGIServlet extends Ht
* SHOULD NOT be defined.
*
*/
- if (sPathInfoCGI != null && !("".equals(sPathInfoCGI))) {
+ if (!("".equals(sPathInfoCGI))) {
sPathTranslatedCGI = context.getRealPath(sPathInfoCGI);
}
if (sPathTranslatedCGI == null || "".equals(sPathTranslatedCGI)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
