From 72f5a1c6b3964ee172bc9fb706829281fbb6a163 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Jan 2011 20:33:06 +0000
Subject: [PATCH] Correct a typo in RequestFilter, that would lead to an NPE in
 RemoteAddrFilter, RemoteHostFilter when "allow" attribute is empty. 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
---
 java/org/apache/catalina/filters/RequestFilter.java | 2 +-
 webapps/docs/changelog.xml                          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java
index a471bf281..a417ebc2c 100644
--- 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 7075092cc..0c1d8bbce 100644
--- 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">
-- 
2.11.0