Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 32731 invoked from network); 3 Jun 2010 07:56:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Jun 2010 07:56:51 -0000 Received: (qmail 8388 invoked by uid 500); 3 Jun 2010 07:56:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 8239 invoked by uid 500); 3 Jun 2010 07:56:48 -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 8230 invoked by uid 99); 3 Jun 2010 07:56:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 07:56:48 +0000 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; Thu, 03 Jun 2010 07:56:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 467A2238897D; Thu, 3 Jun 2010 07:56:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r950905 - in /tomcat/trunk/java/org/apache: catalina/security/SecurityClassLoad.java coyote/http11/Http11AprProcessor.java coyote/http11/Http11NioProcessor.java coyote/http11/Http11Processor.java Date: Thu, 03 Jun 2010 07:56:24 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100603075624.467A2238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Jun 3 07:56:23 2010 New Revision: 950905 URL: http://svn.apache.org/viewvc?rev=950905&view=rev Log: Clean up FastHttpDateFormat initialisation when using a security manager as prompted by Konstantin Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=950905&r1=950904&r2=950905&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original) +++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu Jun 3 07:56:23 2010 @@ -43,7 +43,6 @@ public final class SecurityClassLoad { loadUtilPackage(loader); loadJavaxPackage(loader); loadCoyotePackage(loader); - loadHttp11Package(loader); loadTomcatPackage(loader); } @@ -141,13 +140,6 @@ public final class SecurityClassLoad { } - private final static void loadHttp11Package(ClassLoader loader) - throws Exception { - String basePackage = "org.apache.coyote.http11."; - loader.loadClass(basePackage + "Http11Processor$1"); - } - - private final static void loadCoyotePackage(ClassLoader loader) throws Exception { String basePackage = "org.apache.catalina.connector."; Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=950905&r1=950904&r2=950905&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jun 3 07:56:23 2010 @@ -106,10 +106,6 @@ public class Http11AprProcessor implemen // Cause loading of HexUtils HexUtils.load(); - - // Cause loading of FastHttpDateFormat - FastHttpDateFormat.getCurrentDate(); - } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=950905&r1=950904&r2=950905&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jun 3 07:56:23 2010 @@ -96,10 +96,6 @@ public class Http11NioProcessor extends // Cause loading of HexUtils HexUtils.load(); - - // Cause loading of FastHttpDateFormat - FastHttpDateFormat.getCurrentDate(); - } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=950905&r1=950904&r2=950905&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Jun 3 07:56:23 2010 @@ -930,19 +930,7 @@ public class Http11Processor extends Abs } // Add date header - String date = null; - if (isSecurityEnabled){ - date = AccessController.doPrivileged( - new PrivilegedAction() { - public String run(){ - return FastHttpDateFormat.getCurrentDate(); - } - } - ); - } else { - date = FastHttpDateFormat.getCurrentDate(); - } - headers.setValue("Date").setString(date); + headers.setValue("Date").setString(FastHttpDateFormat.getCurrentDate()); // FIXME: Add transfer encoding header --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org