apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13475: Fix invalid char in the gson string

Browse Source 
Thanks fix provided by Frank. The reason is some invalid char in the json
message result in json parsing chaos.

status 13475: resolved fixed
This commit is contained in:
Sheng Yang 2012-02-07 18:19:50 -08:00
parent 99b7b73d7f
commit b97914cc8a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/cloud/agent/transport/Request.java
View File

@ -20,6 +20,7 @@ package com.cloud.agent.transport;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Type;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@ -48,6 +49,7 @@ import com.google.gson.JsonNull;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.gson.stream.JsonReader;
/**
* Request is a simple wrapper around command and answer to add sequencing,
@ -228,7 +230,10 @@ public class Request {
public Command[] getCommands() {
if (_cmds == null) {
try {
_cmds = s_gson.fromJson(_content, Command[].class);
StringReader reader = new StringReader(_content);
JsonReader jsonReader = new JsonReader(reader);
jsonReader.setLenient(true);
_cmds = s_gson.fromJson(jsonReader, (Type)Command[].class);
} catch (RuntimeException e) {
s_logger.error("Caught problem with " + _content, e);
throw e;