bug 42444: prevent NPE

Patch provided by Nils Hammar (funkman)

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

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index 2e927fb..3556e74 100644 (file)
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -1035,7 +1035,6 @@ public class AccessLogValve
                 buf.append(request.getProtocol());
             } else {
                 buf.append("- - ");
-                buf.append(request.getProtocol());
             }
         }
     }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 08bdc2c..dcf8dec 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -18,6 +18,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+         <bug>42444</bug>: prevent NPE 
+         Patch provided by Nils Hammar (funkman)
+      </fix>
+      <fix>
          <bug>42361</bug>: Handle multi-part forms when saving requests during
          FORM authentication process. Patch provided by Peter Runge. (markt)
       </fix>