홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Gerrit Code Review
dc2e7c26 1 parent 892509aa

Fix for NPE 

Fix for NPE reported by ONOS-1171

Change-Id: Iadb960eb2806e0d33da034f36ad2a0f9c8aa1be0
Inline Side-by-side
Showing 2 changed files with 23 additions and 0 deletions
......@@ -290,6 +290,14 @@ public class GossipDeviceStore
}
} else {
// FIXME Temporary hack for NPE (ONOS-1171).
// Proper fix is to implement forwarding to master on ConfigProvider
// redo ONOS-490
if (deviceNode == null) {
// silently ignore
return null;
}
DeviceInjectedEvent deviceInjectedEvent = new DeviceInjectedEvent(
providerId, deviceId, deviceDescription);
......@@ -536,6 +544,13 @@ public class GossipDeviceStore
}
} else {
// FIXME Temporary hack for NPE (ONOS-1171).
// Proper fix is to implement forwarding to master on ConfigProvider
// redo ONOS-490
if (deviceNode == null) {
// silently ignore
return null;
}
PortInjectedEvent portInjectedEvent = new PortInjectedEvent(providerId, deviceId, portDescriptions);
ClusterMessage clusterMessage = new ClusterMessage(
......
......@@ -309,6 +309,14 @@ public class GossipLinkStore
}
} else {
// FIXME Temporary hack for NPE (ONOS-1171).
// Proper fix is to implement forwarding to master on ConfigProvider
// redo ONOS-490
if (dstNode == null) {
// silently ignore
return null;
}
LinkInjectedEvent linkInjectedEvent = new LinkInjectedEvent(providerId, linkDescription);
ClusterMessage linkInjectedMessage = new ClusterMessage(localNode,
......