remm 01/01/18 12:20:56
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Fix inclusion problems by catching the IllegalStateException which
can be thrown by the servlet container.
Revision Changes Path
1.19 +19 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultServlet.java 2001/01/08 16:45:55 1.18
+++ DefaultServlet.java 2001/01/18 20:20:55 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.18 2001/01/08 16:45:55 remm Exp $
- * $Revision: 1.18 $
- * $Date: 2001/01/08 16:45:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.19 2001/01/18 20:20:55 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/01/18 20:20:55 $
*
* ====================================================================
*
@@ -113,7 +113,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.18 $ $Date: 2001/01/08 16:45:55 $
+ * @version $Revision: 1.19 $ $Date: 2001/01/18 20:20:55 $
*/
public class DefaultServlet
@@ -1456,7 +1456,11 @@
// Copy the input stream to our output stream (if requested)
if (content) {
- response.setBufferSize(output);
+ try {
+ response.setBufferSize(output);
+ } catch (IllegalStateException e) {
+ // Silent catch
+ }
if (ostream != null) {
copy(resourceInfo, ostream);
} else {
@@ -1489,7 +1493,11 @@
}
if (content) {
- response.setBufferSize(output);
+ try {
+ response.setBufferSize(output);
+ } catch (IllegalStateException e) {
+ // Silent catch
+ }
if (ostream != null) {
copy(resourceInfo, ostream, range);
} else {
@@ -1503,7 +1511,11 @@
+ mimeSeparation);
if (content) {
- response.setBufferSize(output);
+ try {
+ response.setBufferSize(output);
+ } catch (IllegalStateException e) {
+ // Silent catch
+ }
if (ostream != null) {
copy(resourceInfo, ostream, ranges.elements(),
contentType);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
