From 132393a4a23dba0706fb6e19fb787561d83d69bc Mon Sep 17 00:00:00 2001 From: Charles Chan Date: Thu, 4 Jan 2018 14:26:07 -0800 Subject: [PATCH] CORD-2470 Fix NPEs Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8 --- .../java/org/onosproject/segmentrouting/McastHandler.java | 2 +- .../onosproject/segmentrouting/SegmentRoutingManager.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java index a131e4a0b6..80affc19d5 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java @@ -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); diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java index a0fc5323aa..62ad7634e0 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java @@ -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"); }