mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 21:31:00 +02:00
Code Issues Projects Releases Wiki Activity

CORD-2470 Fix NPEs

Browse Source 
Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8
This commit is contained in:
Charles Chan 2018-01-04 14:26:07 -08:00
parent ef92f19c6c
commit 132393a4a2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
View File

@ -537,7 +537,7 @@ public class McastHandler {
.forEach(entry -> {
ConnectPoint source = getSource(entry.getKey().mcastIp());
removeGroupFromDevice(entry.getKey().deviceId(), entry.getKey().mcastIp(),
assignedVlan(deviceId.equals(source.deviceId()) ? source : null));
assignedVlan(source != null && deviceId.equals(source.deviceId()) ? source : null));
mcastNextObjStore.remove(entry.getKey());
});
log.debug("{} is removed from mcastNextObjStore", deviceId);

5
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
View File

@ -426,6 +426,9 @@ public class SegmentRoutingManager implements SegmentRoutingService {
cfgService.registerConfigFactory(xConnectConfigFactory);
cfgService.registerConfigFactory(mcastConfigFactory);
cfgService.registerConfigFactory(pwaasConfigFactory);
cfgListener.configureNetwork();
hostService.addListener(hostListener);
packetService.addProcessor(processor, PacketProcessor.director(2));
linkService.addListener(linkListener);
@ -433,8 +436,6 @@ public class SegmentRoutingManager implements SegmentRoutingService {
multicastRouteService.addListener(mcastListener);
routeService.addListener(routeListener);
cfgListener.configureNetwork();
log.info("Started");
}