Author: markt
Date: Tue Mar 22 09:42:29 2011
New Revision: 1084115
URL: http://svn.apache.org/viewvc?rev=1084115&view=rev
Log:
Use standard approach for pre-loading classes
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1084115&r1=1084114&r2=1084115&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Mar 22
09:42:29 2011
@@ -81,7 +81,6 @@ import org.apache.tomcat.util.ExceptionU
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.StringCache;
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.Parameters;
@@ -112,12 +111,6 @@ public class Request
// ----------------------------------------------------------- Constructors
- static {
- // Ensure that classes are loaded for SM
- new StringCache.ByteEntry();
- new StringCache.CharEntry();
- }
-
public Request() {
formats[0].setTimeZone(GMT_ZONE);
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=1084115&r1=1084114&r2=1084115&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue
Mar 22 09:42:29 2011
@@ -238,6 +238,10 @@ public final class SecurityClassLoad {
private static final void loadTomcatPackage(ClassLoader loader)
throws Exception {
final String basePackage = "org.apache.tomcat.";
+ loader.loadClass(basePackage + "util.buf.StringCache");
+ loader.loadClass(basePackage + "util.buf.StringCache$ByteEntry");
+ loader.loadClass(basePackage + "util.buf.StringCache$CharEntry");
+ loader.loadClass(basePackage + "util.http.HttpMessages");
// Make sure system property is read at this point
Class<?> clazz = loader.loadClass(
basePackage + "util.http.FastHttpDateFormat");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
