[jbossweb-commits] JBossWeb SVN: r1682 - in branches/2.1.x: webapps/docs and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2011-03-17 05:05:19 -0400 (Thu, 17 Mar 2011)
New Revision: 1682
Modified:
branches/2.1.x/java/org/apache/catalina/valves/AccessLogValve.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
For case 00434276.
Modified: branches/2.1.x/java/org/apache/catalina/valves/AccessLogValve.java
===================================================================
--- branches/2.1.x/java/org/apache/catalina/valves/AccessLogValve.java 2011-03-16 10:09:18
UTC (rev 1681)
+++ branches/2.1.x/java/org/apache/catalina/valves/AccessLogValve.java 2011-03-17 09:05:19
UTC (rev 1682)
@@ -27,7 +27,6 @@
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@@ -856,8 +855,7 @@
// Initialize the timeZone, Date formatters, and currentDate
timezone = TimeZone.getDefault();
timeZoneNoDST = calculateTimeZoneOffset(timezone.getRawOffset());
- Calendar calendar = Calendar.getInstance(timezone);
- int offset = calendar.get(Calendar.DST_OFFSET);
+ int offset = timezone.getDSTSavings();
timeZoneDST = calculateTimeZoneOffset(timezone.getRawOffset() + offset);
if (fileDateFormat == null || fileDateFormat.length() == 0)
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-03-16 10:09:18 UTC (rev 1681)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-03-17 09:05:19 UTC (rev 1682)
@@ -15,6 +15,16 @@
</properties>
<body>
+<section name="JBoss Web 2.1.12.GA (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>46982</bug>: Correct reporting of DST offset in access logs.
(markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 2.1.11.GA (remm)">
<subsection name="Catalina">
<changelog>