This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new f64a2a7 BZ64226: Reset timezone after parsing a date f64a2a7 is described below commit f64a2a7150bff01bca479c7c319b7e8db879df26 Author: remm <r...@apache.org> AuthorDate: Fri Mar 20 10:46:10 2020 +0100 BZ64226: Reset timezone after parsing a date As the date format is reused, this has to be reset. Test case submitted by Gary Thomas. --- .../tomcat/util/http/ConcurrentDateFormat.java | 1 + .../tomcat/util/http/TestConcurrentDateFormat.java | 51 ++++++++++++++++++++++ webapps/docs/changelog.xml | 4 ++ 3 files changed, 56 insertions(+) diff --git a/java/org/apache/tomcat/util/http/ConcurrentDateFormat.java b/java/org/apache/tomcat/util/http/ConcurrentDateFormat.java index 9ce953f..02a456f 100644 --- a/java/org/apache/tomcat/util/http/ConcurrentDateFormat.java +++ b/java/org/apache/tomcat/util/http/ConcurrentDateFormat.java @@ -60,6 +60,7 @@ public class ConcurrentDateFormat { sdf = createInstance(); } Date result = sdf.parse(source); + sdf.setTimeZone(timezone); queue.add(sdf); return result; } diff --git a/test/org/apache/tomcat/util/http/TestConcurrentDateFormat.java b/test/org/apache/tomcat/util/http/TestConcurrentDateFormat.java new file mode 100644 index 0000000..51731a0 --- /dev/null +++ b/test/org/apache/tomcat/util/http/TestConcurrentDateFormat.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tomcat.util.http; + +import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; + +import org.junit.Assert; +import org.junit.Test; + +public class TestConcurrentDateFormat { + + private static final String DATE_RFC5322 = "EEE, dd MMM yyyy HH:mm:ss z"; + TimeZone tz = TimeZone.getTimeZone("GMT"); + + @Test + public void testFormatReturnsGMT() { + ConcurrentDateFormat format = createConcurrentDateFormat(); + Date date = new Date(); + String formattedDate = format.format(date); + Assert.assertTrue(formattedDate.endsWith("GMT")); + } + + @Test + public void testFormatReturnsGMTAfterParseCET() throws Exception { + ConcurrentDateFormat format = createConcurrentDateFormat(); + format.parse("Thu, 12 Mar 2020 14:40:22 CET"); + Date date = new Date(); + String formattedDate = format.format(date); + Assert.assertTrue(formattedDate.endsWith("GMT")); + } + + private ConcurrentDateFormat createConcurrentDateFormat() { + return new ConcurrentDateFormat(DATE_RFC5322, Locale.US, tz); + } +} diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3650d95..221e378 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -57,6 +57,10 @@ <code>org.apache.tomcat.util.digester.PROPERTY_SOURCE</code> system property. (remm) </update> + <fix> + <bug>64226</bug>: Reset timezone after parsing a date since the date + format is reused. Test case submitted by Gary Thomas. (remm) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org