Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 18127 invoked from network); 27 Sep 2008 18:35:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Sep 2008 18:35:00 -0000 Received: (qmail 8686 invoked by uid 500); 27 Sep 2008 18:34:56 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 8625 invoked by uid 500); 27 Sep 2008 18:34:55 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 8614 invoked by uid 99); 27 Sep 2008 18:34:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Sep 2008 11:34:55 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Sep 2008 18:34:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E987F238887A; Sat, 27 Sep 2008 11:34:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699714 - /tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Date: Sat, 27 Sep 2008 18:34:06 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080927183406.E987F238887A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sat Sep 27 11:34:06 2008 New Revision: 699714 URL: http://svn.apache.org/viewvc?rev=699714&view=rev Log: Fix date format issue reported by Find Bugs. Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=699714&r1=699713&r2=699714&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Sat Sep 27 11:34:06 2008 @@ -20,6 +20,8 @@ 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 @@ */ 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 @@ 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 @@ 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)) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org