You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2002/03/11 21:11:05 UTC
cvs commit: jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters CompressionServletResponseWrapper.java
amyroh 02/03/11 12:11:05
Modified: webapps/examples/WEB-INF/classes/compressionFilters
CompressionServletResponseWrapper.java
Log:
Add flush the writer if it exists. The writer may buffer some characters.
Reported by Greg Wilkins.
Clean up some debugging statements.
Revision Changes Path
1.5 +17 -13 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Index: CompressionServletResponseWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompressionServletResponseWrapper.java 6 Sep 2001 23:05:08 -0000 1.4
+++ CompressionServletResponseWrapper.java 11 Mar 2002 20:11:05 -0000 1.5
@@ -1,8 +1,8 @@
/*
* CompressionServletResponseWrapper.java
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java,v 1.4 2001/09/06 23:05:08 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/09/06 23:05:08 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java,v 1.5 2002/03/11 20:11:05 amyroh Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/11 20:11:05 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
* the CompressionServletResponseStream implementation..
*
* @author Amy Roh
- * @version $Revision: 1.4 $, $Date: 2001/09/06 23:05:08 $
+ * @version $Revision: 1.5 $, $Date: 2002/03/11 20:11:05 $
*/
public class CompressionServletResponseWrapper extends HttpServletResponseWrapper {
@@ -96,9 +96,10 @@
*/
public CompressionServletResponseWrapper(HttpServletResponse response) {
- super(response);
- origResponse = response;
- //System.out.println("CompressionServletResponseWrapper constructor gets called");
+
+ super(response);
+ origResponse = response;
+
}
@@ -144,8 +145,9 @@
* Set threshold number
*/
public void setCompressionThreshold(int threshold) {
- //System.out.println("setCompressionThreshold @ CompressionServletResponseWrapper");
+
this.threshold = threshold;
+
}
/**
@@ -156,7 +158,6 @@
*/
public ServletOutputStream createOutputStream() throws IOException {
- //System.out.println("createOutputStream gets called");
return (new CompressionResponseStream(origResponse));
}
@@ -166,6 +167,7 @@
* Finish a response.
*/
public void finishResponse() {
+
try {
if (writer != null) {
writer.close();
@@ -175,6 +177,7 @@
}
} catch (IOException e) {
}
+
}
@@ -188,8 +191,11 @@
*/
public void flushBuffer() throws IOException {
- // System.out.println("flush buffer @ CompressionServletResponseWrapper");
- ((CompressionResponseStream)stream).flush();
+ if (writer != null) {
+ writer.flush();
+ } else {
+ ((CompressionResponseStream)stream).flush();
+ }
}
@@ -207,7 +213,6 @@
if (stream == null)
stream = createOutputStream();
- //System.out.println("stream is set to "+stream+" in getOutputStream");
((CompressionResponseStream) stream).setBuffer(threshold);
return (stream);
@@ -229,7 +234,6 @@
throw new IllegalStateException("getOutputStream() has already been called for this response");
stream = createOutputStream();
- //System.out.println("strean is set to "+stream+" in getWriter");
((CompressionResponseStream) stream).setBuffer(threshold);
writer = new PrintWriter(stream);
return (writer);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>