Author: mcucchiara
Date: Tue Jan 4 18:14:46 2011
New Revision: 1055126
URL: http://svn.apache.org/viewvc?rev=1055126&view=rev
Log:
WW-3519 Added encoding type to prevent encoding errors
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java?rev=1055126&r1=1055125&r2=1055126&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
(original)
+++
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
Tue Jan 4 18:14:46 2011
@@ -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) {
