Fixed few coverity issues

sedukull · sedukull · commit f9e11540c7e7 · 2014-08-11T16:02:19.000+05:30
diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
@@ -100,7 +100,7 @@ public synchronized boolean configure(String name, Map<String, Object> params) {
     }
 
     @Override
-    public String getName() {
+    public synchronized String getName() {
         return _name;
     }
 
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -3988,11 +3988,14 @@ protected Network enableVlanNetwork(Connection conn, long tag, XsLocalNetwork ne
             s_logger.debug("Creating VLAN " + tag + " on host " + _host.ip + " on device " + nPifr.device);
         }
         VLAN vlan = VLAN.create(conn, nPif, tag, vlanNetwork);
-        VLAN.Record vlanr = vlan.getRecord(conn);
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("VLAN is created for " + tag + ".  The uuid is " + vlanr.uuid);
+        if (vlan != null) {
+            VLAN.Record vlanr = vlan.getRecord(conn);
+            if (vlanr != null) {
+                if (s_logger.isDebugEnabled()) {
+                    s_logger.debug("VLAN is created for " + tag + ".  The uuid is " + vlanr.uuid);
+                }
+            }
         }
-
         return vlanNetwork;
     }
 
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -278,10 +278,11 @@ public void recalculateCapacity() {
             // Calculate CPU and RAM capacities
             //     get all hosts...even if they are not in 'UP' state
             List<HostVO> hosts = _resourceMgr.listAllNotInMaintenanceHostsInOneZone(Host.Type.Routing, null);
-            for (HostVO host : hosts) {
-                _capacityMgr.updateCapacityForHost(host);
+            if (hosts != null) {
+                for (HostVO host : hosts) {
+                    _capacityMgr.updateCapacityForHost(host);
+                }
             }
-
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("Done executing cpu/ram capacity update");
                 s_logger.debug("Executing storage capacity update");
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1600,7 +1600,9 @@ public Ternary<Boolean, List<NetworkOfferingVO>, Network> doInTransaction(Transa
                 if (implementedNetwork == null || implementedNetwork.first() == null) {
                     s_logger.warn("Failed to implement the network " + guestNetwork);
                 }
-                guestNetwork = implementedNetwork.second();
+                if (implementedNetwork != null) {
+                    guestNetwork = implementedNetwork.second();
+                }
             } catch (Exception ex) {
                 s_logger.warn("Failed to implement network " + guestNetwork + " elements and resources as a part of" + " network provision due to ", ex);
                 CloudRuntimeException e = new CloudRuntimeException("Failed to implement network (with specified id)"

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public synchronized boolean configure(String name, Map<String, Object> params) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Override`
`103`		`- public String getName() {`
	`103`	`+ public synchronized String getName() {`
`104`	`104`	`return _name;`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -3988,11 +3988,14 @@ protected Network enableVlanNetwork(Connection conn, long tag, XsLocalNetwork ne`
`3988`	`3988`	`s_logger.debug("Creating VLAN " + tag + " on host " + _host.ip + " on device " + nPifr.device);`
`3989`	`3989`	`}`
`3990`	`3990`	`VLAN vlan = VLAN.create(conn, nPif, tag, vlanNetwork);`
`3991`		`- VLAN.Record vlanr = vlan.getRecord(conn);`
`3992`		`- if (s_logger.isDebugEnabled()) {`
`3993`		`- s_logger.debug("VLAN is created for " + tag + ". The uuid is " + vlanr.uuid);`
	`3991`	`+ if (vlan != null) {`
	`3992`	`+ VLAN.Record vlanr = vlan.getRecord(conn);`
	`3993`	`+ if (vlanr != null) {`
	`3994`	`+ if (s_logger.isDebugEnabled()) {`
	`3995`	`+ s_logger.debug("VLAN is created for " + tag + ". The uuid is " + vlanr.uuid);`
	`3996`	`+ }`
	`3997`	`+ }`
`3994`	`3998`	`}`
`3995`		`-`
`3996`	`3999`	`return vlanNetwork;`
`3997`	`4000`	`}`
`3998`	`4001`