Author: kkolinko
Date: Sat Jan 15 17:43:46 2011
New Revision: 1059379
URL: http://svn.apache.org/viewvc?rev=1059379&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50591
Do not throw NullPointerException when ReplicationValve#filter is not set.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=1059379&r1=1059378&r2=1059379&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Sat Jan
15 17:43:46 2011
@@ -551,7 +551,8 @@ public class ReplicationValve
* @return True if no session change
*/
protected boolean isRequestWithoutSessionChange(String uri) {
- return filter.matcher(uri).matches();
+ Pattern f = filter;
+ return f != null && f.matcher(uri).matches();
}
/**
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059379&r1=1059378&r2=1059379&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 15 17:43:46 2011
@@ -80,6 +80,9 @@
</subsection>
<subsection name="Cluster">
<changelog>
+ <fix>
+ <bug>50591</bug>: Fix NPE in ReplicationValve. (kkolinko)
+ </fix>
<add>
Internationalise the log messages for the FarmWarDeployer. (markt)
</add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
