Repository: incubator-unomi
Updated Branches:
  refs/heads/feature-UNOMI-102 cb83301ff -> df59f575b


UNOMI-105 set characters encoding to avoid issue in the response


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/74fdd9ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/74fdd9ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/74fdd9ce

Branch: refs/heads/feature-UNOMI-102
Commit: 74fdd9ce67841f5decb7c627f914302137e0d542
Parents: d19be22
Author: dgaillard <dgaill...@jahia.com>
Authored: Mon Jun 26 16:25:17 2017 +0200
Committer: dgaillard <dgaill...@jahia.com>
Committed: Mon Jun 26 16:25:17 2017 +0200

----------------------------------------------------------------------
 wab/src/main/java/org/apache/unomi/web/ContextServlet.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/74fdd9ce/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java 
b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index ad70c18..ba8071e 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -249,12 +249,12 @@ public class ContextServlet extends HttpServlet {
         boolean noScript = "json".equals(extension);
         String contextAsJSONString = 
CustomObjectMapper.getObjectMapper().writeValueAsString(data);
         Writer responseWriter;
-        if(noScript){
-            response.setCharacterEncoding("UTF-8");
+        response.setCharacterEncoding("UTF-8");
+        if (noScript) {
             responseWriter = response.getWriter();
             response.setContentType("application/json");
             IOUtils.write(contextAsJSONString, responseWriter);
-        }else {
+        } else {
             responseWriter = response.getWriter();
             responseWriter.append("window.digitalData = window.digitalData || 
{};\n")
                     .append("var cxs = ")

Reply via email to