Index: G:/eclipse/workspace/JSPWiki/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
===================================================================
--- G:/eclipse/workspace/JSPWiki/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java	(revision 687558)
+++ G:/eclipse/workspace/JSPWiki/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java	(working copy)
@@ -20,9 +20,7 @@
  */
 package com.ecyrd.jspwiki.ui;
 
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -203,7 +201,7 @@
             return string;
         }
         
-        log.debug("...Inserting...");
+        if (log.isDebugEnabled()) log.debug("...Inserting...");
         
         String[] resources = TemplateManager.getResourceRequests( wikiContext, type );
         
@@ -211,7 +209,7 @@
         
         for( int i = 0; i < resources.length; i++  )
         {
-            log.debug("...:::"+resources[i]);
+            if (log.isDebugEnabled()) log.debug("...:::"+resources[i]);
             concat.append( resources[i] );
         }
 
@@ -230,7 +228,7 @@
     private static class MyServletResponseWrapper
         extends HttpServletResponseWrapper
     {
-        private CharArrayWriter m_output;
+        private ByteArrayOutputStream m_output;
       
         /** 
          *  How large the initial buffer should be.  This should be tuned to achieve
@@ -240,8 +238,8 @@
         
         public MyServletResponseWrapper( HttpServletResponse r )
         {
-            super(r);
-            m_output = new CharArrayWriter( INIT_BUFFER_SIZE );
+            super( r );
+            m_output = new ByteArrayOutputStream( INIT_BUFFER_SIZE );
         }
 
         /**
@@ -250,7 +248,7 @@
          */
         public PrintWriter getWriter()
         {
-            return new PrintWriter( m_output );
+            return new PrintWriter( getOutputStream(), true );
         }
 
         public ServletOutputStream getOutputStream()
@@ -260,17 +258,17 @@
 
         static class MyServletOutputStream extends ServletOutputStream
         {
-            CharArrayWriter m_buffer;
+            private DataOutputStream m_stream;
 
-            public MyServletOutputStream(CharArrayWriter aCharArrayWriter)
+            public MyServletOutputStream( OutputStream aOutput )
             {
                 super();
-                m_buffer = aCharArrayWriter;
+                m_stream = new DataOutputStream( aOutput );
             }
 
-            public void write(int aInt)
+            public void write( int aInt ) throws IOException
             {
-                m_buffer.write( aInt );
+                m_stream.write( aInt );
             }
 
         }