commit eb42a733464fcad5b94204e05cbec4e271fd3cd0
author Charles Chan <rascov@gmail.com> Mon Jun 25 13:01:35 2018 -0700
committer Charles Chan <rascov@gmail.com> Wed Jun 27 11:58:02 2018 -0700
tree 4a624e904ae905b04d8af103dea8abfceaca0ed8
parent 7cdb87f7e09d0d5be629c8411cf335f7320b4b7b

Fix NPE introduced by gerrit 18883

Change-Id: I1ba7956d114114a6084c252621c42cea55dfe731

apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java

diff --git a/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java b/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
index faa2c80..662fdda 100644
--- a/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
+++ b/apps/routing/fpm/app/src/main/java/org/onosproject/routing/fpm/FpmManager.java
@@ -459,8 +459,11 @@
         IpPrefix prefix = IpPrefix.valueOf(dstAddress, rtNetlink.dstLength());
 
         // Ignore routes that we sent.
-        if (gateway != null && ((prefix.isIp4() && (pdPushNextHopIPv4.contains(gateway))) ||
-                pdPushNextHopIPv6.contains(gateway))) {
+        if (gateway != null && (
+                (prefix.isIp4() && pdPushNextHopIPv4 != null &&
+                        pdPushNextHopIPv4.contains(gateway.getIp4Address())) ||
+                (prefix.isIp6() && pdPushNextHopIPv6 != null &&
+                        pdPushNextHopIPv6.contains(gateway.getIp6Address())))) {
             if (routeInDhcpStore(prefix) || routeInRipStore(prefix)) {
                 return;
             }