s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always return null on attempt to get non-existent field, even from null

Browse Source
This commit is contained in:
Owen Stephens 2018-05-10 16:37:38 -04:00
parent 1e2c0c0a04
commit 13f2ebe9fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/com/google/refine/grel/ast/FieldAccessorExpr.java
View File

@ -63,17 +63,17 @@ public class FieldAccessorExpr implements Evaluable {
if (ExpressionUtils.isError(o)) { if (ExpressionUtils.isError(o)) {
return o; // bubble the error up return o; // bubble the error up
} else if (o == null) { } else if (o == null) {
return new EvalError("Cannot retrieve field from null"); return null;
} else if (o instanceof HasFields) { } else if (o instanceof HasFields) {
return ((HasFields) o).getField(_fieldName, bindings); return ((HasFields) o).getField(_fieldName, bindings);
} else if (o instanceof JSONObject) { } else if (o instanceof JSONObject) {
try { try {
return ((JSONObject) o).get(_fieldName); return ((JSONObject) o).get(_fieldName);
} catch (JSONException e) { } catch (JSONException e) {
return new EvalError("Object does not have any field, including " + _fieldName); return null;
} }
} else { } else {
return new EvalError("Object does not have any field, including " + _fieldName); return null;
} }
} }