ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Bugfix for json map with null entry

Browse source
This commit is contained in:
Ziver Koc 2015-10-29 20:03:28 +01:00
parent 5fa807e50b
commit ef173f479b
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/zutil/parser/json/JSONObjectInputStream.java Normal file → Executable file
View file

@ -130,6 +130,8 @@ public class JSONObjectInputStream extends InputStream implements ObjectInput, C
@SuppressWarnings({ "rawtypes", "unchecked" })
protected Object readType(Class<?> type, Class<?>[] genType, String key, DataNode json) throws IllegalAccessException, ClassNotFoundException, InstantiationException, UnsupportedDataTypeException, NoSuchFieldException {
if(json == null)
return null;
// Field type is a primitive?
if(type.isPrimitive() || String.class.isAssignableFrom(type)){
return readPrimitive(type, json);
@ -171,7 +173,7 @@ public class JSONObjectInputStream extends InputStream implements ObjectInput, C
protected Object readObject(Class<?> type, String key, DataNode json) throws IllegalAccessException, InstantiationException, ClassNotFoundException, IllegalArgumentException, UnsupportedDataTypeException, NoSuchFieldException {
// Only parse if json is a map
if(!json.isMap())
if(json == null || !json.isMap())
return null;
// See if the Object id is in the cache before continuing
if(json.getString("@object_id") != null && objectCache.containsKey(json.getInt(MD_OBJECT_ID)))