commit | a44d18acf5bf0f13b31b2239bb60182ab3b3ce22 | [log] [tgz] |
---|---|---|
author | Pier Luigi <pierventre@hotmail.com> | Fri Jan 13 14:00:23 2017 -0800 |
committer | Jonathan Hart <jono@onlab.us> | Fri Jan 20 16:46:55 2017 +0000 |
tree | 213b7597adb4ea531c31694f101a0b066d5c3b73 | |
parent | d26ea65e8412bcb5ee8167e0eb0c17aa996846ba [diff] |
Fixes NPE in route manager and activates probing. Change-Id: I1138a5ee60d9709a100f269d03f789c76fdfcbfe
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java index 7902473..5f3640b 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java +++ b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
@@ -145,9 +145,11 @@ if (routes != null) { routes.forEach(route -> { NextHopData nextHopData = routeStore.getNextHop(route.nextHop()); + if (nextHopData != null) { l.post(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, - new ResolvedRoute(route, nextHopData.mac(), - nextHopData.location()))); + new ResolvedRoute(route, nextHopData.mac(), + nextHopData.location()))); + } }); } });