jfclere 2005/05/05 00:00:10 Modified: catalina/src/share/org/apache/catalina/servlets DefaultServlet.java Log: Undo my previous commit - Still looking for a better solution - Revision Changes Path 1.38 +1 -11 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Index: DefaultServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- DefaultServlet.java 4 May 2005 07:04:30 -0000 1.37 +++ DefaultServlet.java 5 May 2005 07:00:09 -0000 1.38 @@ -1725,16 +1725,6 @@ if (cacheEntry.resource != null) { byte buffer[] = cacheEntry.resource.getContent(); if (buffer != null) { - if (fileEncoding != null && - cacheEntry.attributes.getMimeType()!=null && - cacheEntry.attributes.getMimeType().equals("text/html")) { - /* the "binary" have to be converted from fileEncoding to UTF-8 */ - try { - String str = new String(buffer, fileEncoding); - buffer = str.getBytes("UTF-8"); - } catch (Exception e) { - } - } ostream.write(buffer, 0, buffer.length); return; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]