홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
d4955ae9 1 parent 2f6f9072

Preventing NPEs in stores via notifyDelegate 

Change-Id: I1c4b83c6a03b1f69a3ea1329724a7208d47cefa4
Inline Side-by-side
Showing 4 changed files with 20 additions and 23 deletions
......@@ -101,9 +101,9 @@ public class DistributedComponentConfigStore
String[] keys = event.key().split(SEP);
if (event.type() == INSERT || event.type() == UPDATE) {
String value = event.newValue().value();
delegate.notify(new ComponentConfigEvent(PROPERTY_SET, keys[0], keys[1], value));
notifyDelegate(new ComponentConfigEvent(PROPERTY_SET, keys[0], keys[1], value));
} else if (event.type() == REMOVE) {
delegate.notify(new ComponentConfigEvent(PROPERTY_UNSET, keys[0], keys[1], null));
notifyDelegate(new ComponentConfigEvent(PROPERTY_UNSET, keys[0], keys[1], null));
}
}
}
......
......@@ -844,7 +844,7 @@ public class ECDeviceStore
if (event.type() == PUT) {
Device device = devices.get(event.key());
if (device != null) {
delegate.notify(new DeviceEvent(PORT_STATS_UPDATED, device));
notifyDelegate(new DeviceEvent(PORT_STATS_UPDATED, device));
}
}
}
......
......@@ -1823,7 +1823,7 @@ public class GossipDeviceStore
if (event.type() == PUT) {
Device device = devices.get(event.key());
if (device != null) {
delegate.notify(new DeviceEvent(PORT_STATS_UPDATED, device));
notifyDelegate(new DeviceEvent(PORT_STATS_UPDATED, device));
}
}
}
......
......@@ -25,7 +25,6 @@ import org.onlab.util.KryoNamespace;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.mcast.McastEvent;
import org.onosproject.net.mcast.McastRoute;
import org.onosproject.net.mcast.McastRouteInfo;
import org.onosproject.net.mcast.McastStore;
import org.onosproject.net.mcast.McastStoreDelegate;
import org.onosproject.store.AbstractStore;
......@@ -39,6 +38,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import static org.onosproject.net.mcast.McastRouteInfo.mcastRouteInfo;
import static org.slf4j.LoggerFactory.getLogger;
/**
......@@ -96,14 +96,14 @@ public class DistributedMcastStore extends AbstractStore<McastEvent, McastStoreD
switch (operation) {
case ADD:
if (mcastRoutes.putIfAbsent(route, MulticastData.empty()) == null) {
delegate.notify(new McastEvent(McastEvent.Type.ROUTE_ADDED,
McastRouteInfo.mcastRouteInfo(route)));
notifyDelegate(new McastEvent(McastEvent.Type.ROUTE_ADDED,
mcastRouteInfo(route)));
}
break;
case REMOVE:
if (mcastRoutes.remove(route) != null) {
delegate.notify(new McastEvent(McastEvent.Type.ROUTE_REMOVED,
McastRouteInfo.mcastRouteInfo(route)));
notifyDelegate(new McastEvent(McastEvent.Type.ROUTE_REMOVED,
mcastRouteInfo(route)));
}
break;
default:
......@@ -124,10 +124,10 @@ public class DistributedMcastStore extends AbstractStore<McastEvent, McastStoreD
if (data != null) {
delegate.notify(new McastEvent(McastEvent.Type.SOURCE_ADDED,
McastRouteInfo.mcastRouteInfo(route,
data.sinks(),
source)));
notifyDelegate(new McastEvent(McastEvent.Type.SOURCE_ADDED,
mcastRouteInfo(route,
data.sinks(),
source)));
}
}
......@@ -157,19 +157,16 @@ public class DistributedMcastStore extends AbstractStore<McastEvent, McastStoreD
if (data != null) {
switch (operation) {
case ADD:
delegate.notify(new McastEvent(
McastEvent.Type.SINK_ADDED,
McastRouteInfo.mcastRouteInfo(route,
sink,
data.source())));
notifyDelegate(new McastEvent(McastEvent.Type.SINK_ADDED,
mcastRouteInfo(route, sink,
data.source())));
break;
case REMOVE:
if (data != null) {
delegate.notify(new McastEvent(
McastEvent.Type.SINK_REMOVED,
McastRouteInfo.mcastRouteInfo(route,
sink,
data.source())));
notifyDelegate(new McastEvent(McastEvent.Type.SINK_REMOVED,
mcastRouteInfo(route,
sink,
data.source())));
}
break;
default:
......