Clean up FastHttpDateFormat initialisation when using a security manager as prompted...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@950905 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java
index be10606..966d2fd 100644 (file)
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -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.";

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 14a7c93..b8a927c 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -106,10 +106,6 @@ public class Http11AprProcessor implements ActionHook {
 
         // Cause loading of HexUtils
         HexUtils.load();
-
-        // Cause loading of FastHttpDateFormat
-        FastHttpDateFormat.getCurrentDate();
-
     }
 
 

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 993b48b..6f70794 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -96,10 +96,6 @@ public class Http11NioProcessor extends AbstractHttp11Processor implements Actio
 
         // Cause loading of HexUtils
         HexUtils.load();
-
-        // Cause loading of FastHttpDateFormat
-        FastHttpDateFormat.getCurrentDate();
-
     }
 
 

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index f927e01..2dd853a 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -930,19 +930,7 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo
         }
 
         // 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