myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r379145 - /myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
Date Mon, 20 Feb 2006 15:18:03 GMT
Author: imario
Date: Mon Feb 20 07:18:02 2006
New Revision: 379145

URL: http://svn.apache.org/viewcvs?rev=379145&view=rev
Log:
re-apply MYFACES-1042 which has been masked by MYFACES-1034 which
contained a renamed old version of AddResource.java


Modified:
    myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java

Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java?rev=379145&r1=379144&r2=379145&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
(original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java
Mon Feb 20 07:18:02 2006
@@ -702,7 +702,8 @@
         }
 
         ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
-                .selectContentType(request.getHeader("accept")), null);
+                .selectContentType(request.getHeader("accept")),
+                response.getCharacterEncoding());
 
         if (afterBodyContentInsertPosition >= 0)
         {
@@ -788,7 +789,8 @@
             HttpServletResponse response) throws IOException
     {
         ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
-                .selectContentType(request.getHeader("accept")), null);
+                .selectContentType(request.getHeader("accept")),
+                response.getCharacterEncoding());
         writer.write(originalResponse.toString());
     }
 



Mime
View raw message