Correct a typo in RequestFilter, that would lead to an NPE in RemoteAddrFilter, Remot...

The RequestFilterValve class is not affected by this issue.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059409 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java
index a471bf2..a417ebc 100644 (file)
--- a/java/org/apache/catalina/filters/RequestFilter.java
+++ b/java/org/apache/catalina/filters/RequestFilter.java
@@ -224,7 +224,7 @@ public abstract class RequestFilter
         }
      
         // Check the allow patterns, if any
-        if (allow != null & allow.matcher(property).matches()) {
+        if (allow != null && allow.matcher(property).matches()) {
             return true;
         }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7075092..0c1d8bb 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,9 @@
         Provide additional control over component class loaders, primarily for
         use when embedding. (markt)
       </add>
+      <fix>
+        Fix NPE in RemoteAddrFilter, RemoteHostFilter. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">