From: funkman <funkman@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 19 May 2007 18:31:09 +0000 (+0000)
Subject: bug 42444: prevent NPE
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=35de3c30bfd0511e9453458074dc126e192df162;p=tomcat7.0

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 2e927fb02..3556e74b8 100644
--- 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 08bdc2cd8..dcf8dec91 100644
--- 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>