apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity issue 606007, 606008

Browse Source
This commit is contained in:
Hugo Trippaers 2014-01-13 11:58:51 +01:00
parent 044a2078a1
commit 16d333f06d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResourceManagerImpl.java
View File

@ -92,6 +92,9 @@ public class OpenDaylightControllerResourceManagerImpl implements OpenDaylightCo
final String deviceName = NetworkDevice.OpenDaylightController.getName(); final String deviceName = NetworkDevice.OpenDaylightController.getName();
NetworkDevice networkDevice = NetworkDevice.getNetworkDevice(deviceName); NetworkDevice networkDevice = NetworkDevice.getNetworkDevice(deviceName);
if (networkDevice == null) {
throw new CloudRuntimeException("No network device found for name " + deviceName);
}
final Long physicalNetworkId = cmd.getPhysicalNetworkId(); final Long physicalNetworkId = cmd.getPhysicalNetworkId();
PhysicalNetworkVO physicalNetwork = physicalNetworkDao.findById(physicalNetworkId); PhysicalNetworkVO physicalNetwork = physicalNetworkDao.findById(physicalNetworkId);
if (physicalNetwork == null) { if (physicalNetwork == null) {
@ -156,11 +159,13 @@ public class OpenDaylightControllerResourceManagerImpl implements OpenDaylightCo
// Lets see if there are networks that use us // Lets see if there are networks that use us
List<NetworkVO> networkList = networkDao.listByPhysicalNetwork(physicalNetworkId); List<NetworkVO> networkList = networkDao.listByPhysicalNetwork(physicalNetworkId);
// Networks with broadcast type lswitch are ours if (networkList != null) {
for (NetworkVO network : networkList) { // Networks with broadcast type lswitch are ours
if (network.getBroadcastDomainType() == Networks.BroadcastDomainType.OpenDaylight) { for (NetworkVO network : networkList) {
if ((network.getState() != Network.State.Shutdown) && (network.getState() != Network.State.Destroy)) { if (network.getBroadcastDomainType() == Networks.BroadcastDomainType.OpenDaylight) {
throw new CloudRuntimeException("This Controller can not be deleted as there are one or more logical networks provisioned by cloudstack."); if ((network.getState() != Network.State.Shutdown) && (network.getState() != Network.State.Destroy)) {
throw new CloudRuntimeException("This Controller can not be deleted as there are one or more logical networks provisioned by cloudstack.");
}
} }
} }
} }