mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 13:21:21 +02:00
Code Issues Projects Releases Wiki Activity

Remove branch condition which is always true

Browse Source 
Change-Id: I27385061986f7b43f78365278fa763c70a451b46
This commit is contained in:
Sho SHIMIZU 2015-10-27 11:38:37 -07:00 committed by Gerrit Code Review
parent 08105be3e6
commit 0fa6d3b745
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,22 +191,20 @@ public class VirtualPortManager implements VirtualPortService {
@Override @Override
public boolean updatePorts(Iterable<VirtualPort> vPorts) { public boolean updatePorts(Iterable<VirtualPort> vPorts) {
checkNotNull(vPorts, VIRTUALPORT_NOT_NULL); checkNotNull(vPorts, VIRTUALPORT_NOT_NULL);
if (vPorts != null) { for (VirtualPort vPort : vPorts) {
for (VirtualPort vPort : vPorts) { vPortStore.put(vPort.portId(), vPort);
vPortStore.put(vPort.portId(), vPort); if (!vPortStore.containsKey(vPort.portId())) {
if (!vPortStore.containsKey(vPort.portId())) { log.debug("The virtualPort is not exist whose identifier is {}",
log.debug("The virtualPort is not exist whose identifier is {}", vPort.portId().toString());
vPort.portId().toString()); return false;
return false; }
}
vPortStore.put(vPort.portId(), vPort); vPortStore.put(vPort.portId(), vPort);
if (!vPort.equals(vPortStore.get(vPort.portId()))) { if (!vPort.equals(vPortStore.get(vPort.portId()))) {
log.debug("The virtualPort is updated failed whose identifier is {}", log.debug("The virtualPort is updated failed whose identifier is {}",
vPort.portId().toString()); vPort.portId().toString());
return false; return false;
}
} }
} }
return true; return true;
@ -215,14 +213,12 @@ public class VirtualPortManager implements VirtualPortService {
@Override @Override
public boolean removePorts(Iterable<VirtualPortId> vPortIds) { public boolean removePorts(Iterable<VirtualPortId> vPortIds) {
checkNotNull(vPortIds, VIRTUALPORT_ID_NULL); checkNotNull(vPortIds, VIRTUALPORT_ID_NULL);
if (vPortIds != null) { for (VirtualPortId vPortId : vPortIds) {
for (VirtualPortId vPortId : vPortIds) { vPortStore.remove(vPortId);
vPortStore.remove(vPortId); if (vPortStore.containsKey(vPortId)) {
if (vPortStore.containsKey(vPortId)) { log.debug("The virtualPort is removed failed whose identifier is {}",
log.debug("The virtualPort is removed failed whose identifier is {}", vPortId.toString());
vPortId.toString()); return false;
return false;
}
} }
} }
return true; return true;