kinman      01/12/10 10:23:00

  Modified:    jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch XmlOutputter.java
  Log:
  PR: 5096
  Submitted by: Hans Bergsten
  
  - Use UTF-8 encoding for XML view of a JSP page.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.2  +10 -5     
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java
  
  Index: XmlOutputter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -u -r1.16.2.1 -r1.16.2.2
  --- XmlOutputter.java 2001/10/09 17:56:42     1.16.2.1
  +++ XmlOutputter.java 2001/12/10 18:23:00     1.16.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
 1.16.2.1 2001/10/09 17:56:42 kinman Exp $
  - * $Revision: 1.16.2.1 $
  - * $Date: 2001/10/09 17:56:42 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
 1.16.2.2 2001/12/10 18:23:00 kinman Exp $
  + * $Revision: 1.16.2.2 $
  + * $Date: 2001/12/10 18:23:00 $
    *
    * ====================================================================
    *
  @@ -290,8 +290,13 @@
           append("jsp:root", rootAttrs, buff, false);
        buff.append(sb.toString());
           buff.append("</jsp:root>");
  -     InputStream is = 
  -         new ByteArrayInputStream(buff.toString().getBytes());
  +        InputStream is = null;
  +        try {
  +            is = new ByteArrayInputStream(buff.toString().getBytes("UTF-8"));
  +        }
  +        catch (java.io.UnsupportedEncodingException e) {
  +            // Can never happen? I assume all platforms support UTF-8
  +        }
           //System.out.println("XmlOutputter: \n" + buff);
        PageData pageData = new PageDataImpl(is);
           return pageData;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to