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

Log '-' rather than null when request headers are not present
Based on a patch by Per Landberg

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

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index f0948f4..9deaa8e 100644 (file)
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -1238,7 +1238,12 @@ public class AccessLogValve
 
         public void addElement(StringBuffer buf, Date date, Request request,
                 Response response, long time) {
-            buf.append(request.getHeader(header));
+            String value = request.getHeader(header);
+            if (value == null) {
+                buf.append('-');
+            } else {
+                buf.append(value);
+            }
         }
     }