Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1

Former-commit-id: 793cf6d676 [formerly e036b3e70e] [formerly 793cf6d676 [formerly e036b3e70e] [formerly 2bc4cfdaae [formerly 04284dafa2f563224067e6a3312d69cc942e1d7d]]]
Former-commit-id: 2bc4cfdaae
Former-commit-id: 899a19bbe9 [formerly 219c690931]
Former-commit-id: 42d70d1af6
This commit is contained in:
Lee Venable 2014-12-12 11:20:19 -06:00 committed by Gerrit Code Review
commit d535422219

View file

@ -52,6 +52,7 @@ import com.raytheon.uf.viz.core.notification.NotificationMessage;
import com.raytheon.uf.viz.monitor.IMonitor;
import com.raytheon.uf.viz.monitor.Monitor;
import com.raytheon.uf.viz.monitor.ObsMonitor;
import com.raytheon.uf.viz.monitor.data.AreaContainer;
import com.raytheon.uf.viz.monitor.data.MonitoringArea;
import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports;
import com.raytheon.uf.viz.monitor.data.ObReport;
@ -376,13 +377,14 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
@Override
protected void process(ObReport result) throws Exception {
obData.addReport(result);
String zone = findZone(result.getPlatformId());
getTableData().getArea(zone).addReport(result.getObservationTime(),
result);
if (zone != null) {
AreaContainer ac = getTableData().getArea(zone);
if (ac != null) {
ac.addReport(result.getObservationTime(), result);
}
}
fireMonitorEvent(this);
}
/**