Index: src/java/com/opensymphony/webwork/util/WebWorkUtil.java
===================================================================
RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/util/WebWorkUtil.java,v
retrieving revision 1.11
diff -u -r1.11 WebWorkUtil.java
--- src/java/com/opensymphony/webwork/util/WebWorkUtil.java	19 Apr 2004 06:18:52 -0000	1.11
+++ src/java/com/opensymphony/webwork/util/WebWorkUtil.java	21 Apr 2004 11:56:38 -0000
@@ -4,10 +4,11 @@
  */
 package com.opensymphony.webwork.util;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.Writer;
+import java.io.StringWriter;
 import java.net.URLEncoder;
 import java.util.Hashtable;
 import java.util.Map;
@@ -30,7 +31,7 @@
 /**
  *        WebWork base utility class, for use in Velocity and Freemarker templates
  *
- * @author Rickard Öberg (rickard@dreambean.com)
+ * @author Rickard Öberg (rickard@dreambean.com)
  * @author Cameron Braid
  * @version $Revision: 1.11 $
  */
@@ -108,23 +109,22 @@
     }
 
     //~ Inner Classes //////////////////////////////////////////////////////////
-
     static class ResponseWrapper extends HttpServletResponseWrapper {
-        ByteArrayOutputStream bout;
+        StringWriter strout;
         PrintWriter writer;
         ServletOutputStream sout;
 
         ResponseWrapper(HttpServletResponse aResponse) {
             super(aResponse);
-            bout = new ByteArrayOutputStream();
-            sout = new ServletOutputStreamWrapper(bout);
-            writer = new PrintWriter(new OutputStreamWriter(bout));
+            strout = new StringWriter();
+            sout = new ServletOutputStreamWrapper(strout);
+            writer = new PrintWriter(strout);
         }
 
         public String getData() {
             writer.flush();
 
-            return bout.toString();
+            return strout.toString();
         }
 
         public ServletOutputStream getOutputStream() {
@@ -137,15 +137,13 @@
     }
 
     static class ServletOutputStreamWrapper extends ServletOutputStream {
-        ByteArrayOutputStream stream;
-
-        ServletOutputStreamWrapper(ByteArrayOutputStream aStream) {
-            stream = aStream;
+        StringWriter writer;
+        ServletOutputStreamWrapper(StringWriter aWriter) {
+            writer = aWriter;
         }
 
         public void write(int aByte) {
-            stream.write(aByte);
+            writer.write(aByte);
         }
-    }
-    
+    }    
 }