remm 01/01/18 12:27:01
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.24 +19 -7
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultServlet.java 2001/01/15 05:51:26 1.23
+++ DefaultServlet.java 2001/01/18 20:26:58 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.23 2001/01/15 05:51:26 remm Exp $
- * $Revision: 1.23 $
- * $Date: 2001/01/15 05:51:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.24 2001/01/18 20:26:58 remm Exp $
+ * $Revision: 1.24 $
+ * $Date: 2001/01/18 20:26:58 $
*
* ====================================================================
*
@@ -118,7 +118,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.23 $ $Date: 2001/01/15 05:51:26 $
+ * @version $Revision: 1.24 $ $Date: 2001/01/18 20:26:58 $
*/
public class DefaultServlet
@@ -1532,7 +1532,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 {
@@ -1565,7 +1569,11 @@
}
if (content) {
- response.setBufferSize(output);
+ try {
+ response.setBufferSize(output);
+ } catch (IllegalStateException e) {
+ // Silent catch
+ }
if (ostream != null) {
copy(resourceInfo, ostream, range);
} else {
@@ -1579,7 +1587,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]
