From e06d8fe130529bea681f379cfe5118e41a7d45d7 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Sun, 7 Mar 2010 00:35:44 +0000 Subject: [PATCH] Better checking for null value in Cell.load. git-svn-id: http://google-refine.googlecode.com/svn/trunk@224 7d457c2a-affb-35e4-300a-418c747d4874 --- src/main/java/com/metaweb/gridworks/model/Cell.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/metaweb/gridworks/model/Cell.java b/src/main/java/com/metaweb/gridworks/model/Cell.java index 98ea25b37..c41f6fd85 100644 --- a/src/main/java/com/metaweb/gridworks/model/Cell.java +++ b/src/main/java/com/metaweb/gridworks/model/Cell.java @@ -84,9 +84,9 @@ public class Cell implements Serializable, HasFields, Jsonizable { if (obj.has("e")) { value = new EvalError(obj.getString("e")); - } else if (obj.has("v")) { + } else if (obj.has("v") && !obj.isNull("v")) { value = (Serializable) obj.get("v"); - if (obj.has("t")) { + if (obj.has("t") && !obj.isNull("t")) { String type = obj.getString("t"); if ("date".equals(type)) { value = ParsingUtilities.stringToDate((String) value); @@ -94,7 +94,7 @@ public class Cell implements Serializable, HasFields, Jsonizable { } } - if (obj.has("r")) { + if (obj.has("r") && !obj.isNull("r")) { recon = Recon.load(obj.getJSONObject("r")); }