Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50591

Do not throw NullPointerException when ReplicationValve#filter is not set.

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

diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index f352709..e2fca4d 100644 (file)
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -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();
     }
 
     /**

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 99eee45..7075092 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>