CORD-2470 Fix NPEs
Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8
diff --git a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index a0fc532..62ad763 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -426,6 +426,9 @@
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 @@
multicastRouteService.addListener(mcastListener);
routeService.addListener(routeListener);
- cfgListener.configureNetwork();
-
log.info("Started");
}