cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/4.3 to dae442e
Date Wed, 02 Jul 2014 14:08:16 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 85bed5fa2 -> dae442e09


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

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dae442e0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dae442e0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dae442e0

Branch: refs/heads/4.3
Commit: dae442e091cd0b82d01c7ee23883c27e8df9895c
Parents: 85bed5f
Author: Rajani Karuturi <rajanikaruturi@gmail.com>
Authored: Wed Jun 11 14:36:06 2014 +0530
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Wed Jul 2 16:08:00 2014 +0200

----------------------------------------------------------------------
 .../cloud/configuration/ConfigurationManagerImpl.java | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dae442e0/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 662eaae..41128cd 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -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) {


Mime
View raw message