You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2017/09/25 10:38:17 UTC
[myfaces-tobago] branch tobago-2.0.x updated: TOBAGO_1805 - Tobago
2: Broken Emojis after partial Update
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch tobago-2.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-2.0.x by this push:
new 4ab23b8 TOBAGO_1805 - Tobago 2: Broken Emojis after partial Update
4ab23b8 is described below
commit 4ab23b8c1a67b044437d4b6d09200ec03bd8312b
Author: Volker Weber <Vo...@inexso.de>
AuthorDate: Mon Sep 25 10:55:36 2017 +0200
TOBAGO_1805 - Tobago 2: Broken Emojis after partial Update
---
.../myfaces/tobago/internal/ajax/AjaxResponseRenderer.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
index 0bd6d0f..d16bfd2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
@@ -73,11 +73,11 @@ public class AjaxResponseRenderer {
writeResponse(facesContext, renderKit);
}
- private void renderComponent(
- final FacesContext facesContext, final RenderKit renderKit, final String clientId, final UIComponent component)
+ private void renderComponent(final FacesContext facesContext, final RenderKit renderKit, final String charset,
+ final String clientId, final UIComponent component)
throws IOException {
final PrintWriter writer = getPrintWriter(facesContext);
- final JsonResponseWriter jsonWriter = getJsonResponseWriter(renderKit, writer);
+ final JsonResponseWriter jsonWriter = getJsonResponseWriter(renderKit, writer, charset);
facesContext.setResponseWriter(jsonWriter);
@@ -159,7 +159,7 @@ public class AjaxResponseRenderer {
final UIComponent component = entry.getValue();
FacesContextUtils.setAjaxComponentId(facesContext, entry.getKey());
- renderComponent(facesContext, renderKit, entry.getKey(), component);
+ renderComponent(facesContext, renderKit, charset, entry.getKey(), component);
}
}
@@ -183,9 +183,10 @@ public class AjaxResponseRenderer {
throw new IOException("No ResponseWriter found for response " + response);
}
- private JsonResponseWriter getJsonResponseWriter(final RenderKit renderKit, final PrintWriter writer) {
+ private JsonResponseWriter getJsonResponseWriter(
+ final RenderKit renderKit, final PrintWriter writer, final String charset) {
- final ResponseWriter newWriter = renderKit.createResponseWriter(writer, CONTENT_TYPE, null);
+ final ResponseWriter newWriter = renderKit.createResponseWriter(writer, CONTENT_TYPE, charset);
if (newWriter instanceof JsonResponseWriter) {
return (JsonResponseWriter) newWriter;
} else {
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].