remm 2005/08/17 08:07:19
Modified: catalina/src/share/org/apache/catalina/connector
Request.java
util/java/org/apache/tomcat/util/buf StringCache.java
webapps/docs changelog.xml
Log:
- 36228: Some more CNFE.
Revision Changes Path
1.25 +8 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Request.java 10 May 2005 20:51:43 -0000 1.24
+++ Request.java 17 Aug 2005 15:07:19 -0000 1.25
@@ -46,6 +46,7 @@
import org.apache.tomcat.util.buf.B2CConverter;
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;
@@ -85,6 +86,12 @@
// -----------------------------------------------------------
Constructors
+ static {
+ // Ensure that classes are loaded for SM
+ new StringCache.ByteEntry();
+ new StringCache.CharEntry();
+ }
+
public Request() {
formats[0].setTimeZone(GMT_ZONE);
1.6 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/StringCache.java
Index: StringCache.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/StringCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringCache.java 27 Jul 2005 15:12:02 -0000 1.5
+++ StringCache.java 17 Aug 2005 15:07:19 -0000 1.6
@@ -620,7 +620,7 @@
// -------------------------------------------------- ByteEntry Inner
Class
- protected static class ByteEntry {
+ public static class ByteEntry {
public byte[] name = null;
public String enc = null;
@@ -645,7 +645,7 @@
// -------------------------------------------------- CharEntry Inner
Class
- protected static class CharEntry {
+ public static class CharEntry {
public char[] name = null;
public String value = null;
1.358 +2 -2 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- changelog.xml 16 Aug 2005 16:52:42 -0000 1.357
+++ changelog.xml 17 Aug 2005 15:07:19 -0000 1.358
@@ -73,7 +73,7 @@
<bug>34794</bug>: Update connector documentation to include
clientAuth attribute. (yoavs)
</update>
<fix>
- <bug>35894</bug>: Fix CNFE when starting in a sandbox. (billbarker)
+ <bug>35894</bug>, <bug>36228</bug>: Fix CNFE when starting in a
sandbox. (billbarker, remm)
</fix>
<fix>
Add version check for Tomcat native so that incompatible API changes
are detected early (remm)
@@ -121,7 +121,7 @@
</fix>
<fix>
<bug>36173</bug>: Add missing sync in FastHttpDateFormat.formatDate,
submitted
- by Alexei (remm)
+ by Alexei Krainiouk (remm)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
