You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/06/03 09:56:24 UTC
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
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<String>() {
- 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