Remove branch condition which is always true

Change-Id: I27385061986f7b43f78365278fa763c70a451b46

Remove branch condition which is always true
Change-Id: I27385061986f7b43f78365278fa763c70a451b46
Sho SHIMIZU · Gerrit Code Review
Commit 0fa6d3b7451d4033df8456598b2ece4b7b5d596c 0fa6d3b7 1 parent 08105be3
Showing 1 changed file with 18 additions and 22 deletions
apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
View file @0fa6d3b
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
View file @0fa6d3b
@@ -191,22 +191,20 @@ public class VirtualPortManager implements VirtualPortService {
     @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 @@ public class VirtualPortManager implements VirtualPortService {
     @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;