commit 132393a4a23dba0706fb6e19fb787561d83d69bc
author Charles Chan <rascov@gmail.com> Thu Jan 04 14:26:07 2018 -0800
committer Charles Chan <rascov@gmail.com> Tue Jan 09 13:55:27 2018 -0800
tree 843671954d2889ae297238e51ae1775a1dd1dc6c
parent ef92f19c6cdda44dd1fd012893b1907c83879c78

CORD-2470 Fix NPEs

Change-Id: Ic31725905d0410ed2abdd8b87991c8cc362457f8

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

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 a0fc532..62ad763 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 @@
         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");
     }