commit b2137431aab071f16e3d8c7f12e629a0cffbc0f1
author Ray Milkey <ray@opennetworking.org> Tue May 08 16:23:06 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed May 09 19:09:57 2018 +0000
tree 3b36dabeea835b3dbcf542ea045f57457f08d553
parent 164ecf60195b03ca1b7b39c5c00dda6fa7609a7c

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 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)