| commit | 09c6699da398a521e02049917357301246a40542 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Fri Mar 09 15:53:44 2018 -0800 |
| committer | Charles Chan <rascov@gmail.com> | Thu Mar 15 00:05:44 2018 -0700 |
| tree | 929c6a3f6ff726988bbf4b3e1a0de99feefba012 | |
| parent | bfbc9003fd4ece9397b40454d71544701b6260b5 [diff] |
Fix NPE caused by RoutingRulePopulator not initiated before linkHandler.init() Change-Id: If21a2628c9d4e7687c26fda467240093dbc723c8
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/LinkHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/LinkHandler.java index c643991..90b0e1f 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/LinkHandler.java +++ b/apps/segmentrouting/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); } /**
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 7f44d2d..439a3d8 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -430,6 +430,8 @@ multicastRouteService.addListener(mcastListener); routeService.addListener(routeListener); + linkHandler.init(); + log.info("Started"); }