commit e93f6619e254fcfdce34b6b5e3dd8f4d286000e1
author Andrea Campanella <andrea@opennetworking.org> Wed Apr 04 13:10:45 2018 +0200
committer Andrea Campanella <andrea@opennetworking.org> Wed Apr 04 12:51:24 2018 +0000
tree de0f3a32cd6bb0f53395c51e455e6e02abfb31e1
parent d7e3b4bc9d9d90edb15d8002ada5437fa84311f0

Fix NPE thrown when searching multiple routes and IP is null

Change-Id: I3f3f45285c8d4be7106e397c83f18c5e56d9ec21
(cherry picked from commit c07125d728ff0f1778e43ed2c2cda0c962a5a1c3)

apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java

diff --git a/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java b/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
index cf40de9..4f22f97 100644
--- a/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
+++ b/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
@@ -918,12 +918,13 @@
         } else if (trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_DST) != null) {
             ip = ((IPCriterion) trace.getInitialPacket().getCriterion(Criterion.Type.IPV6_DST)).ip().address();
         }
-
-        Optional<ResolvedRoute> optionalRoute = routeService.longestPrefixLookup(ip);
-        if (ip != null && optionalRoute.isPresent()) {
-            ResolvedRoute route = optionalRoute.get();
-            route.prefix();
-            multipleRoutes = routeService.getAllResolvedRoutes(route.prefix()).size() > 1;
+        if (ip != null) {
+            Optional<ResolvedRoute> optionalRoute = routeService.longestPrefixLookup(ip);
+            if (optionalRoute.isPresent()) {
+                ResolvedRoute route = optionalRoute.get();
+                route.prefix();
+                multipleRoutes = routeService.getAllResolvedRoutes(route.prefix()).size() > 1;
+            }
         }
         return multipleRoutes;
     }