ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed null field issues in JSON

Browse source
This commit is contained in:
Ziver Koc 2015-10-07 22:32:26 +00:00
parent 0bb193fba3
commit 051f6fdcf8
5 changed files with 52 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/zutil/parser/json/JSONObjectInputStream.java
View file

@ -104,6 +104,9 @@ 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())
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)))
return objectCache.get(json.getInt(MD_OBJECT_ID));
@ -185,13 +188,20 @@ public class JSONObjectInputStream extends InputStream implements ObjectInput, C
}
// Field is a new Object
else{
Field field = type.getField(key);
Field field = getFieldInClass(type, key);
if(field != null)
return readObject(field.getType(), key, json);
else
return readObject(null, key, json);
}
}
private Field getFieldInClass(Class<?> c, String name){
for(Field f : c.getFields()){
if(f.getName().equals(name))
return f;
}
return null;
}
protected static Object readPrimitive(Class<?> type, DataNode json){
if (type == int.class ||