Author: kkolinko
Date: Sat Jan 15 20:33:06 2011
New Revision: 1059409
URL: http://svn.apache.org/viewvc?rev=1059409&view=rev
Log:
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.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=1059409&r1=1059408&r2=1059409&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java Sat Jan 15
20:33:06 2011
@@ -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;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059409&r1=1059408&r2=1059409&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 15 20:33:06 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
