From 881aedf5d286ec280ab0673d5877d2efba813fc9 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Jan 2011 17:43:46 +0000
Subject: [PATCH] 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
---
 java/org/apache/catalina/ha/tcp/ReplicationValve.java | 3 ++-
 webapps/docs/changelog.xml                            | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index f35270904..e2fca4d94 100644
--- 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 99eee4555..7075092cc 100644
--- 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>
-- 
2.11.0