From 0b9a3e774e08b4c00f8afd970bd9c07d24d99b9d Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Tue, 26 Jun 2007 16:58:12 +0000 Subject: [PATCH] Fix for AWC-1275 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java | 5 ++++- .../org/alfresco/web/app/servlet/ajax/InvokeCommand.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java b/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java index 8be4d6b524..3e3854b251 100644 --- a/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java @@ -71,7 +71,10 @@ public class AjaxServlet extends BaseServlet throws ServletException, IOException { request.setCharacterEncoding("utf-8"); - + // set default character encoding for the response + response.setCharacterEncoding("utf-8"); + response.setContentType("text/xml;charset=UTF-8"); + long startTime = 0; String uri = request.getRequestURI(); if (logger.isDebugEnabled()) diff --git a/source/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java b/source/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java index 5d28d0cc6f..6f08f26a57 100644 --- a/source/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java +++ b/source/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java @@ -208,7 +208,7 @@ public class InvokeCommand extends BaseAjaxCommand final RenderKit renderKit = renderFactory.getRenderKit(facesContext, viewRoot.getRenderKitId()); final ResponseWriter writer = - renderKit.createResponseWriter(new OutputStreamWriter(os), + renderKit.createResponseWriter(new OutputStreamWriter(os, "UTF-8"), mimetype, "UTF-8"); facesContext.setResponseWriter(writer);