From fbdbf1f4af255b48f190d2a8a290660f0fdc507e Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 27 Sep 2008 18:34:06 +0000 Subject: [PATCH] Fix date format issue reported by Find Bugs. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@699714 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java index f214c7abc..f642ac500 100644 --- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java +++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java @@ -20,6 +20,8 @@ package org.apache.catalina.ssi; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import javax.servlet.ServletContext; import javax.servlet.ServletOutputStream; @@ -42,6 +44,8 @@ public class ResponseIncludeWrapper extends HttpServletResponseWrapper { */ private static final String CONTENT_TYPE = "content-type"; private static final String LAST_MODIFIED = "last-modified"; + private static final DateFormat format = + new SimpleDateFormat(DateTool.RFC1123_PATTERN, DateTool.LOCALE_US); protected long lastModified = -1; private String contentType = null; @@ -208,7 +212,9 @@ public class ResponseIncludeWrapper extends HttpServletResponseWrapper { String lname = name.toLowerCase(); if (lname.equals(LAST_MODIFIED)) { try { - lastModified = DateTool.rfc1123Format.parse(value).getTime(); + synchronized(format) { + lastModified = format.parse(value).getTime(); + } } catch (Throwable ignore) { } } else if (lname.equals(CONTENT_TYPE)) { contentType = value; @@ -228,7 +234,9 @@ public class ResponseIncludeWrapper extends HttpServletResponseWrapper { String lname = name.toLowerCase(); if (lname.equals(LAST_MODIFIED)) { try { - lastModified = DateTool.rfc1123Format.parse(value).getTime(); + synchronized(format) { + lastModified = format.parse(value).getTime(); + } } catch (Throwable ignore) { } } else if (lname.equals(CONTENT_TYPE)) -- 2.11.0