fixed crash when unknown probe is requested in the config

OpenSensing · Jan 9, 2016 · 57ca1da · 57ca1da
1 parent c15ff36
commit 57ca1da
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java b/funf_v4/src/main/java/edu/mit/media/funf/FunfManager.java
@@ -540,7 +540,12 @@ public void requestData(DataListener listener, JsonElement probeConfig, Schedule
 			throw new IllegalArgumentException("Probe config cannot be null");
 		}
 		// Use schedule in probeConfig @schedule annotation
-		Probe probe = gson.fromJson(probeConfig, Probe.class);
+		Probe probe = null;
+		try {
+			probe = gson.fromJson(probeConfig, Probe.class);
+		} catch (NullPointerException e) {
+			return;
+		}
 		probe.addStateListener(probeStateListener);
 		if (schedule == null) {
 			DefaultSchedule defaultSchedule = probe.getClass().getAnnotation(DefaultSchedule.class);