From 1f12bfb409eff758b8cec26d65fcd1c8db66c628 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Mon, 1 Nov 2010 18:13:53 +0000 Subject: [PATCH] Fixed bug in HasFieldsListImpl where list members weren't tested for being null. git-svn-id: http://google-refine.googlecode.com/svn/trunk@1735 7d457c2a-affb-35e4-300a-418c747d4874 --- main/src/com/google/refine/expr/HasFieldsListImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main/src/com/google/refine/expr/HasFieldsListImpl.java b/main/src/com/google/refine/expr/HasFieldsListImpl.java index d7ee4a28c..c09f0411b 100644 --- a/main/src/com/google/refine/expr/HasFieldsListImpl.java +++ b/main/src/com/google/refine/expr/HasFieldsListImpl.java @@ -41,16 +41,18 @@ public class HasFieldsListImpl extends ArrayList implements HasFields public Object getField(String name, Properties bindings) { int c = size(); - if (c > 0 && get(0).fieldAlsoHasFields(name)) { + if (c > 0 && get(0) != null && get(0).fieldAlsoHasFields(name)) { HasFieldsListImpl l = new HasFieldsListImpl(); for (int i = 0; i < size(); i++) { - l.add(i, (HasFields) this.get(i).getField(name, bindings)); + HasFields o = this.get(i); + l.add(i, o == null ? null : (HasFields) o.getField(name, bindings)); } return l; } else { Object[] r = new Object[this.size()]; for (int i = 0; i < r.length; i++) { - r[i] = this.get(i).getField(name, bindings); + HasFields o = this.get(i); + r[i] = o == null ? null : o.getField(name, bindings); } return r; }