[Jtidy-cvs] CVS: jtidyservlet/src/java/org/w3c/tidy/servlet/filter BufferedServletOutputStream.java,1.4,1.5 BufferedServletResponse.java,1.4,1.5

[Vlad S. <vl...@us...>]

Update of /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12472/src/java/org/w3c/tidy/servlet/filter

Modified Files:
	BufferedServletOutputStream.java BufferedServletResponse.java 
Log Message:
Prepare for Fix by: Mark Chrisman

Index: BufferedServletOutputStream.java
===================================================================
RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletOutputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BufferedServletOutputStream.java	1 Nov 2004 06:03:13 -0000	1.4
+++ BufferedServletOutputStream.java	29 Apr 2005 21:20:45 -0000	1.5
@@ -149,6 +149,15 @@
     }
 
     /**
+     * Used by BufferedServletResponse.isCommitted 
+     * @return
+     */
+    public boolean hasNonemptyBuffer() 
+    {
+        return (this.buffer.size() != 0);
+    }
+    
+    /**
      * Close this output stream, causing any buffered data to be flushed and
      * any further output data to throw an IOException.
      */

Index: BufferedServletResponse.java
===================================================================
RCS file: /cvsroot/jtidy/jtidyservlet/src/java/org/w3c/tidy/servlet/filter/BufferedServletResponse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BufferedServletResponse.java	1 Nov 2004 06:03:20 -0000	1.4
+++ BufferedServletResponse.java	29 Apr 2005 21:20:45 -0000	1.5
@@ -234,6 +234,17 @@
         return (this.writer);
     }
 
+
+    /**
+     * Fix by: Mark Chrisman
+     * An exception is thrown when using JTidyFilter with a JSP that has a dynamic include which points to a Struts action that forwards to a Tiles definition.
+     * The fix is to override isCommitted() in BufferedServletResponse, to make sure this method correctly reports the "committed" status with our custom output stream
+     */
+    public boolean isCommitted()
+    {
+        return /*(stream != null && stream.hasNonemptyBuffer()) ||*/ super.isCommitted();
+    }
+    
     /**
      * Finish a response.
      */