From f9e11540c7e70f3d6f1a8cc660b4067c2e1ec876 Mon Sep 17 00:00:00 2001
From: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Date: Mon, 11 Aug 2014 16:02:19 +0530
Subject: [PATCH] Fixed few coverity issues

---
 .../com/cloud/agent/dao/impl/PropertiesStorage.java   |  2 +-
 .../xenserver/resource/CitrixResourceBase.java        | 11 +++++++----
 server/src/com/cloud/alert/AlertManagerImpl.java      |  7 ++++---
 .../src/com/cloud/network/IpAddressManagerImpl.java   |  4 +++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
index 08c80497eff..df1b1ea7b27 100755
--- 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 class PropertiesStorage implements StorageComponent {
     }
 
     @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
index 67882e69325..387c80b0b82 100644
--- 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 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             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
index 5b667ad26c6..1dba13b6cb2 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -278,10 +278,11 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi
             // 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
index 2cd544de83d..1f789665523 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1600,7 +1600,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
                 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)"