remm 2003/01/09 10:15:05
Modified: coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java OutputBuffer.java
Log:
- Throw an exception when "creating" the writer if the encoding is invlaid.
Revision Changes Path
1.18 +5 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CoyoteResponse.java 3 Jan 2003 19:31:54 -0000 1.17
+++ CoyoteResponse.java 9 Jan 2003 18:15:05 -0000 1.18
@@ -629,6 +629,7 @@
(sm.getString("coyoteResponse.getWriter.ise"));
usingWriter = true;
+ outputBuffer.checkConverter();
return writer;
}
1.5 +15 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java
Index: OutputBuffer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OutputBuffer.java 5 Jan 2003 11:20:18 -0000 1.4
+++ OutputBuffer.java 9 Jan 2003 18:15:05 -0000 1.5
@@ -581,7 +581,17 @@
}
- protected void setConverter() {
+ public void checkConverter()
+ throws IOException {
+
+ if (!gotEnc)
+ setConverter();
+
+ }
+
+
+ protected void setConverter()
+ throws IOException {
if (coyoteResponse != null)
enc = coyoteResponse.getCharacterEncoding();
@@ -594,6 +604,9 @@
enc = DEFAULT_ENCODING;
conv = (C2BConverter) encoders.get(enc);
if (conv == null) {
+ conv = new C2BConverter(bb, enc);
+ encoders.put(enc, conv);
+ /*
try {
conv = new C2BConverter(bb, enc);
encoders.put(enc, conv);
@@ -608,6 +621,7 @@
}
}
}
+ */
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
