commit 92c325afb784294cc123b3c5f4b520f37a2207bb
author Ray Milkey <ray@opennetworking.org> Tue May 08 16:23:06 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed May 09 21:20:29 2018 +0000
tree 50c254e71f0fc3b1484a2deb4053e6f01287ba30
parent 84ac4df1a879ac4111f2ec78ee61feef9bc98dd8

This fixes an NPE turned up by STC testing [ONOS-7657]

Change-Id: Ic47d7a022908da2f97a8dd4c86916ae4a8d86e9c

apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java

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 084c71e..2adef10 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
@@ -267,6 +267,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)