From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Feb 2011 14:15:34 +0000 (+0000)
Subject: Avoid NPE if no u-a header
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e3db3ec5815be5b08798b04f4c8bc05bea89480d;p=tomcat7.0

Avoid NPE if no u-a header

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

diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index b2c5880cd..c0f88818a 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -125,10 +125,13 @@ public class CrawlerSessionManagerValve extends ValveBase {
 
             // Is this a crawler - cheack the UA headers
             Enumeration<String> uaHeaders = request.getHeaders("user-agent");
-            String uaHeader = uaHeaders.nextElement();
+            String uaHeader = null;
+            if (uaHeaders.hasMoreElements()) {
+                uaHeader = uaHeaders.nextElement();
+            }
             
             // If more than one UA header - assume not a bot
-            if (!uaHeaders.hasMoreElements()) {
+            if (uaHeader != null && !uaHeaders.hasMoreElements()) {
 
                 if (log.isDebugEnabled()) {
                     log.debug(request.hashCode() + ": UserAgent=" + uaHeader);