commit 032b964753b5ab15f9c282f67bb0cecd200da81e
author Ray Milkey <ray@opennetworking.org> Thu Jun 21 08:28:12 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Sat Jun 23 00:07:25 2018 +0000
tree 5d6a29f88491190dce4418736d709eb50cd6f056
parent eb130706ff183ed187e164339b514f434b423e51

Fix some Sonar reported problems with null pointer checks

Change-Id: If6658e38fd76013d065e96a4f0ee427c09b60468

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 42ce4e2..5cfb911 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
@@ -293,7 +293,7 @@
                     }
                 }
 
-                if (pdPushNextHopIPv4 == null || pdPushNextHopIPv4.size() == 0) {
+                if (pdPushNextHopIPv4.size() == 0) {
                     rurIPv4Address = interfaceService.getInterfaces()
                         .stream()
                         .filter(iface -> iface.name().contains("RUR"))
@@ -310,7 +310,7 @@
 
                 }
 
-                if (pdPushNextHopIPv6 == null) {
+                if (pdPushNextHopIPv6.size() == 0) {
                     rurIPv6Address = interfaceService.getInterfaces()
                         .stream()
                         .filter(iface -> iface.name().contains("RUR"))
@@ -327,13 +327,12 @@
                 }
 
                 log.info("PD pushing is enabled.");
-                if (pdPushNextHopIPv4 != null || pdPushNextHopIPv4.size() != 0) {
+                if (pdPushNextHopIPv4.size() != 0) {
                     log.info("ipv4 next-hop {} with {} items", pdPushNextHopIPv4.toString(), pdPushNextHopIPv4.size());
-
                 } else {
                     log.info("ipv4 next-hop is null");
                 }
-                if (pdPushNextHopIPv6 != null || pdPushNextHopIPv6.size() != 0) {
+                if (pdPushNextHopIPv6.size() != 0) {
                     log.info("ipv6 next-hop={} with {} items", pdPushNextHopIPv6.toString(), pdPushNextHopIPv6.size());
                 } else {
                     log.info("ipv6 next-hop is null");