luehe 2004/01/27 16:02:06
Modified: catalina/src/share/org/apache/catalina/core
ApplicationResponse.java
ApplicationHttpResponse.java
Log:
Ignore setBufferSize()/setLocale() calls on included response
Revision Changes Path
1.3 +28 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java
Index: ApplicationResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationResponse.java 2 Sep 2003 21:22:04 -0000 1.2
+++ ApplicationResponse.java 28 Jan 2004 00:02:06 -0000 1.3
@@ -65,6 +65,8 @@
package org.apache.catalina.core;
+import java.util.Locale;
+
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
@@ -178,6 +180,28 @@
if (!included)
getResponse().setContentType(type);
+ }
+
+
+ /**
+ * Ignore <code>setLocale()</code> calls on an included response.
+ *
+ * @param loc The new locale
+ */
+ public void setLocale(Locale loc) {
+ if (!included)
+ getResponse().setLocale(loc);
+ }
+
+
+ /**
+ * Ignore <code>setBufferSize()</code> calls on an included response.
+ *
+ * @param size The buffer size
+ */
+ public void setBufferSize(int size) {
+ if (!included)
+ getResponse().setBufferSize(size);
}
1.4 +15 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
Index: ApplicationHttpResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationHttpResponse.java 26 Jan 2004 19:47:03 -0000 1.3
+++ ApplicationHttpResponse.java 28 Jan 2004 00:02:06 -0000 1.4
@@ -206,6 +206,17 @@
}
+ /**
+ * Ignore <code>setBufferSize()</code> calls on an included response.
+ *
+ * @param size The buffer size
+ */
+ public void setBufferSize(int size) {
+ if (!included)
+ getResponse().setBufferSize(size);
+ }
+
+
// -------------------------------------------- HttpServletResponse Methods
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
