Author: markt
Date: Thu Jun 25 08:19:11 2015
New Revision: 1687431
URL: http://svn.apache.org/r1687431
Log:
Fix NPE
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1687431&r1=1687430&r2=1687431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Thu Jun 25 08:19:11 2015
@@ -858,8 +858,9 @@ public class RemoteIpFilter implements F
}
HttpServletResponse xResponse;
- if (!xRequest.getScheme().equals(request.getScheme()) ||
- xRequest.getServerPort() != request.getServerPort()) {
+ if (xRequest.getScheme() != null &&
+ (!xRequest.getScheme().equals(request.getScheme()) ||
+ xRequest.getServerPort() != request.getServerPort())) {
xResponse = new XForwardedResponse(response,
xRequest.getScheme(), xRequest.getServerPort());
} else {
xResponse = response;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
