commit b39777cfc52eb494578cd9881a7db962bab1a2ee
author Charles Chan <rascov@gmail.com> Fri Mar 09 15:53:44 2018 -0800
committer Charles Chan <rascov@gmail.com> Wed Mar 14 23:49:22 2018 -0700
tree 27bbeb032d8b66a983d5e81decef267577767e42
parent c8e6a50216e81944db5f37541f658484b78fa6d9

Fix NPE caused by RoutingRulePopulator not initiated before linkHandler.init()

Change-Id: If21a2628c9d4e7687c26fda467240093dbc723c8

apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
index 63473a7..948124d 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
@@ -71,7 +71,6 @@
                 .withTimestampProvider((k, v) -> new WallClockTimestamp())
                 .build();
         log.trace("Current size {}", downedPortStore.size());
-        init();
     }
 
     /**
@@ -88,10 +87,9 @@
     /**
      * Initialize LinkHandler.
      */
-    private void init() {
+    void init() {
         log.info("Loading stored links");
-        srManager.linkService.getActiveLinks()
-                .forEach(link -> processLinkAdded(link));
+        srManager.linkService.getActiveLinks().forEach(this::processLinkAdded);
     }
 
     /**

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

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 1f035d7..0e4373b 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -440,6 +440,7 @@
         routeService.addListener(routeListener);
         topologyService.addListener(topologyListener);
 
+        linkHandler.init();
         l2TunnelHandler.init();
 
         log.info("Started");