fix FC on importing custom events

phil-lopreiato · Apr 20, 2014 · 49bf4a2 · 49bf4a2
1 parent c85090a
commit 49bf4a2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/frc-notebook/src/main/java/com/plnyyanks/frcnotebook/database/DatabaseHandler.java b/frc-notebook/src/main/java/com/plnyyanks/frcnotebook/database/DatabaseHandler.java
@@ -9,6 +9,7 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.plnyyanks.frcnotebook.Constants;
 import com.plnyyanks.frcnotebook.datatypes.Event;
@@ -373,7 +374,8 @@ public void importEvents(JsonArray events) {
             event.setEventName(e.get(KEY_EVENTNAME).getAsString());
             event.setShortName(e.get(KEY_EVENTSHORT).getAsString());
             event.setEventYear(e.get(KEY_EVENTYEAR).getAsInt());
-            event.setEventLocation(e.get(KEY_EVENTLOC).getAsString());
+            if(!(e.get(KEY_EVENTLOC) instanceof JsonNull))
+                event.setEventLocation(e.get(KEY_EVENTLOC).getAsString());
             event.setEventStart(e.get(KEY_EVENTSTART).getAsString());
             event.setEventEnd(e.get(KEY_EVENTEND).getAsString());
             event.setOfficial(e.get(KEY_EVENTOFFICIAL).getAsBoolean());