Fix possible NPE

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

diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 965a2bb..bf4268c 100644 (file)
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
+import org.apache.catalina.LifecycleException;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.juli.logging.Log;
@@ -114,6 +115,14 @@ public class CrawlerSessionManagerValve extends ValveBase
 
 
     @Override
+    protected void initInternal() throws LifecycleException {
+        super.initInternal();
+        
+        uaPattern = Pattern.compile(crawlerUserAgents);
+    }
+
+
+    @Override
     public void invoke(Request request, Response response) throws IOException,
             ServletException {
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0798f28..2e8efcb 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -54,6 +54,15 @@
   issues to not "pop up" wrt. others).
 -->
 <section name="Tomcat 7.0.18 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Correct regression introduced in 7.0.17 that triggered an NPE if a
+        CrawlerSessionManagerValve was used without setting crawlerUserAgents.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>