etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

COVERITY: Fixed few coverity issues unused assignments, boxing and unboxing of values etc. 

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
This commit is contained in:
Rajani Karuturi 2014-06-11 14:36:06 +05:30 committed by Sebastien Goasguen
parent 85bed5fa2b
commit dae442e091
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -948,9 +948,7 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
}
// Check if the IP range is valid
if (startIp != null || endIp != null) {
checkIpRange(startIp, endIp, cidrAddress, cidrSize);
}
checkIpRange(startIp, endIp, cidrAddress, cidrSize);
// Check if the IP range overlaps with the public ip
checkOverlapPublicIpRange(zoneId, startIp, endIp);
@ -1011,8 +1009,8 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
// Delete private ip addresses for the pod if there are any
List<DataCenterIpAddressVO> privateIps = _privateIpAddressDao.listByPodIdDcId(Long.valueOf(podId),
pod.getDataCenterId());
List<DataCenterIpAddressVO> privateIps = _privateIpAddressDao.listByPodIdDcId(podId, pod.getDataCenterId());
if (!privateIps.isEmpty()) {
if (!(_privateIpAddressDao.deleteIpAddressByPod(podId))) {
throw new CloudRuntimeException("Failed to cleanup private ip addresses for pod " + podId);
@ -1534,13 +1532,8 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
@ActionEvent(eventType = EventTypes.EVENT_ZONE_DELETE, eventDescription = "deleting zone", async = false)
public boolean deleteZone(DeleteZoneCmd cmd) {
Long userId = CallContext.current().getCallingUserId();
final Long zoneId = cmd.getId();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
}
// Make sure the zone exists
if (!validZone(zoneId)) {
throw new InvalidParameterValueException("A zone with ID: " + zoneId + " does not exist.");
@ -2083,7 +2076,6 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
}
} else {
allowNetworkRate = true;
;
}
if (cmd.getNetworkRate() != null && !allowNetworkRate) {