Omaha #3888 More nulls in Fog

Former-commit-id: 8ebeb60c6e [formerly 62e705005f [formerly 1ceafc3d1512071ed4e82a38c426ee5a9aecf08c]]
Former-commit-id: 62e705005f
Former-commit-id: e63bc78422
This commit is contained in:
Dave Hladky 2015-03-19 14:55:11 -05:00
parent fdf751fa90
commit abd4abb0bb

View file

@ -329,7 +329,9 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
*/
@Override
public void nullifyMonitor() {
monitor.removeMonitorListener(zoneDialog);
if (zoneDialog != null) {
monitor.removeMonitorListener(zoneDialog);
}
ProductAlertObserver.removeObserver(OBS, this);
monitor = null;
}
@ -380,7 +382,9 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
}
}
} else {
monitor.nullifyMonitor();
if (monitor != null) {
monitor.nullifyMonitor();
}
}
}