svn commit: r1545981 - /turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java

[gk]

Author: gk
Date: Wed Nov 27 10:07:06 2013
New Revision: 1545981

URL: http://svn.apache.org/r1545981
Log:
RFC4627: JSON text SHALL be encoded in Unicode. The default encoding is UTF-8.

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java?rev=1545981&r1=1545980&r2=1545981&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java 
(original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONScreen.java 
Wed Nov 27 10:07:06 2013
@@ -117,14 +117,13 @@ public class JSONScreen extends RawScree
     {
         data.declareDirectResponse();
         HttpServletRequest request = data.getRequest();
-
-        //String charset = request.getCharacterEncoding();
-        //if(charset == null)
-        //{
-        //    charset = "UTF-8";
-        //}
-        //BufferedReader in = new BufferedReader(new 
InputStreamReader(request.getInputStream(), charset));
-        BufferedReader in = new BufferedReader(new 
InputStreamReader(request.getInputStream()));
+        
+        String charset = request.getCharacterEncoding();
+        if(charset == null)
+        {
+            charset = "UTF-8";
+        }
+        BufferedReader in = new BufferedReader(new 
InputStreamReader(request.getInputStream(), charset));
 
         // Read the request
         CharArrayWriter cdata = new CharArrayWriter();
@@ -143,7 +142,7 @@ public class JSONScreen extends RawScree
         Object json_res = jsonRpcService.processCall(cdata, json_bridge, 
request);
 
         PrintWriter out = new PrintWriter(
-                new OutputStreamWriter(data.getResponse().getOutputStream()));
+                new 
OutputStreamWriter(data.getResponse().getOutputStream(),charset));
         out.print(json_res.toString());
         out.flush();
         out.close();