commit | 0ae030c2f3e2224d3a802718037cb4d6a7b0090b | [log] [tgz] |
---|---|---|
author | Ray Milkey <ray@opennetworking.org> | Tue May 08 16:23:06 2018 -0700 |
committer | Ray Milkey <ray@opennetworking.org> | Wed May 09 21:19:48 2018 +0000 |
tree | 0754039a8f4f99b9ec5015b04f0d995b0bf3dfa7 | |
parent | 56eefc752626b4af140b74ccb5f4f79bdcb47431 [diff] |
This fixes an NPE turned up by STC testing [ONOS-7657] Change-Id: Ic47d7a022908da2f97a8dd4c86916ae4a8d86e9c
diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java index a0ea6f5..c0d5955 100644 --- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java +++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
@@ -270,6 +270,10 @@ } private void resolve(RouteSet routes) { + if (routes.routes() == null) { + // The routes were removed before we got to them, nothing to do + return; + } Set<ResolvedRoute> resolvedRoutes = routes.routes().stream() .map(this::resolve) .filter(Objects::nonNull)