| commit | ffe1a33da18d69c989b826594756667eedb7ecdd | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Wed Jan 24 10:41:14 2018 -0800 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Thu Jan 25 00:48:10 2018 +0000 |
| tree | 47de92b16dd248664c810eb5d11153f8f4609093 | |
| parent | 9539082d93dc23cff4588d2a4774e1b2db79a573 [diff] [blame] |
SONAR suggestions - more blocker bugs - fixed some cases where pointers could be null - fixed some booleans statements known to always be true or false Change-Id: I0d67c1794b37deeccffda1f4ad0f447857e2a5d1
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 b885f8a..0cf9935 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
@@ -419,8 +419,8 @@ IpPrefix prefix = IpPrefix.valueOf(dstAddress, rtNetlink.dstLength()); // Ignore routes that we sent. - if ((prefix.isIp4() && (gateway.equals(pdPushNextHopIPv4))) || - gateway.equals(pdPushNextHopIPv6)) { + if (gateway != null && ((prefix.isIp4() && (gateway.equals(pdPushNextHopIPv4))) || + gateway.equals(pdPushNextHopIPv6))) { if (routeInDhcpStore(prefix) || routeInRipStore(prefix)) { return; }