commit 0fa6d3b7451d4033df8456598b2ece4b7b5d596c
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Oct 27 11:38:37 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Oct 27 18:53:35 2015 +0000
tree dba5dd70df527d6a3a25f2aa039dec61e3526855
parent 08105be3e60d7dc2807a9f33c817442b70a05d22

Remove branch condition which is always true

Change-Id: I27385061986f7b43f78365278fa763c70a451b46

apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java

diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
index c45373b..daec783 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
@@ -191,22 +191,20 @@
     @Override
     public boolean updatePorts(Iterable<VirtualPort> vPorts) {
         checkNotNull(vPorts, VIRTUALPORT_NOT_NULL);
-        if (vPorts != null) {
-            for (VirtualPort vPort : vPorts) {
-                vPortStore.put(vPort.portId(), vPort);
-                if (!vPortStore.containsKey(vPort.portId())) {
-                    log.debug("The virtualPort is not exist whose identifier is {}",
-                              vPort.portId().toString());
-                    return false;
-                }
+        for (VirtualPort vPort : vPorts) {
+            vPortStore.put(vPort.portId(), vPort);
+            if (!vPortStore.containsKey(vPort.portId())) {
+                log.debug("The virtualPort is not exist whose identifier is {}",
+                          vPort.portId().toString());
+                return false;
+            }
 
-                vPortStore.put(vPort.portId(), vPort);
+            vPortStore.put(vPort.portId(), vPort);
 
-                if (!vPort.equals(vPortStore.get(vPort.portId()))) {
-                    log.debug("The virtualPort is updated failed whose  identifier is {}",
-                              vPort.portId().toString());
-                    return false;
-                }
+            if (!vPort.equals(vPortStore.get(vPort.portId()))) {
+                log.debug("The virtualPort is updated failed whose  identifier is {}",
+                          vPort.portId().toString());
+                return false;
             }
         }
         return true;
@@ -215,14 +213,12 @@
     @Override
     public boolean removePorts(Iterable<VirtualPortId> vPortIds) {
         checkNotNull(vPortIds, VIRTUALPORT_ID_NULL);
-        if (vPortIds != null) {
-            for (VirtualPortId vPortId : vPortIds) {
-                vPortStore.remove(vPortId);
-                if (vPortStore.containsKey(vPortId)) {
-                    log.debug("The virtualPort is removed failed whose identifier is {}",
-                              vPortId.toString());
-                    return false;
-                }
+        for (VirtualPortId vPortId : vPortIds) {
+            vPortStore.remove(vPortId);
+            if (vPortStore.containsKey(vPortId)) {
+                log.debug("The virtualPort is removed failed whose identifier is {}",
+                          vPortId.toString());
+                return false;
             }
         }
         return true;