Another regression in 7.0.18: year number formatting

in AccessLogValve is broken due to type "yyy" instead of "yyyy".

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

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index 25622f1..f45ebf2 100644 (file)
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -263,7 +263,7 @@ public class AccessLogValve extends ValveBase implements AccessLog {
         private class Cache {
 
             /* CLF log format */
-            private static final String cLFFormat = "dd/MMM/yyy:HH:mm:ss";
+            private static final String cLFFormat = "dd/MMM/yyyy:HH:mm:ss";
 
             /* Second used to retrieve CLF format in most recent invocation */
             private long previousSeconds = 0L;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9f78735..90aa4a7 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,6 +71,9 @@
       <add>
         Add option to activate AccessLog for unit tests. (rjung)
       </add>
+      <fix>
+        Fix regression in year number formatting for AccessLogValve. (rjung)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">