From 9515fa8b19686175607f5522a30971c72814924f Mon Sep 17 00:00:00 2001
From: Maurizio Cucchiara <mcucchiara@apache.org>
Date: Tue, 4 Jan 2011 18:14:46 +0000
Subject: [PATCH] WW-3519 Added encoding type to prevent encoding errors

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1055126 13f79535-47bb-0310-9956-ffa450edef68
---
 .../json/src/main/java/org/apache/struts2/json/JSONUtil.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
index 806aa6dad..219f51bc7 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
@@ -171,7 +171,7 @@ public class JSONUtil {
     public static Object deserialize(Reader reader) throws JSONException {
         // read content
         BufferedReader bufferReader = new BufferedReader(reader);
-        String line = null;
+        String line;
         StringBuilder buffer = new StringBuilder();
 
         try {
@@ -234,7 +234,7 @@ public class JSONUtil {
             InputStream in = null;
             try {
                 out = new GZIPOutputStream(response.getOutputStream());
-                in = new ByteArrayInputStream(json.getBytes());
+                in = new ByteArrayInputStream(json.getBytes(serializationParams.getEncoding()));
                 byte[] buf = new byte[1024];
                 int len;
                 while ((len = in.read(buf)) > 0) {