Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't call deserializers with null

Browse Source
This commit is contained in:
Jesse Wilson 2011-09-09 08:13:50 +00:00
parent ee9ffa808a
commit f50cce6d14
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gson/src/main/java/com/google/gson/GsonToMiniGsonTypeAdapter.java
View File

@ -51,7 +51,11 @@ final class GsonToMiniGsonTypeAdapter implements TypeAdapter.Factory {
// TODO: handle if deserializer is null // TODO: handle if deserializer is null
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
return deserializer.deserialize(Streams.parse(reader), typeOfT, createDeserializationContext(miniGson)); JsonElement value = Streams.parse(reader);
if (value.isJsonNull()) {
return null;
}
return deserializer.deserialize(value, typeOfT, createDeserializationContext(miniGson));
} }
@Override @Override
public void write(JsonWriter writer, Object value) throws IOException { public void write(JsonWriter writer, Object value) throws IOException {

2
gson/src/main/java/com/google/gson/JsonElement.java
View File

@ -81,7 +81,7 @@ public abstract class JsonElement {
if (isJsonObject()) { if (isJsonObject()) {
return (JsonObject) this; return (JsonObject) this;
} }
throw new IllegalStateException("This is not a JSON Object."); throw new IllegalStateException("Not a JSON Object: " + this);
} }
/** /**