From 4825017cc75c6a5b20e317b8036dfff1effec68f Mon Sep 17 00:00:00 2001
From: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Date: Thu, 14 Aug 2014 18:31:11 +0530
Subject: [PATCH] Fixed coveirty defects for concurrency, variable comparison
 etc

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
---
 agent/src/com/cloud/agent/Agent.java                  | 11 ++++++-----
 .../api/command/user/iso/RegisterIsoCmd.java          |  2 +-
 awsapi/src/com/cloud/bridge/model/MHostVO.java        |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 2b33f5cf73b..8a3433304dc 100755
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -294,6 +294,11 @@ public class Agent implements HandlerFactory, IAgentControl {
             _watchList.clear();
         }
     }
+    public synchronized void lockStartupTask(Link link)
+    {
+        _startup = new StartupTask(link);
+        _timer.schedule(_startup, _startupWait);
+    }
 
     public void sendStartup(Link link) {
         final StartupCommand[] startup = _resource.initialize();
@@ -309,10 +314,7 @@ public class Agent implements HandlerFactory, IAgentControl {
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("Sending Startup: " + request.toString());
             }
-            synchronized (this) {
-                _startup = new StartupTask(link);
-                _timer.schedule(_startup, _startupWait);
-            }
+            lockStartupTask(link);
             try {
                 link.send(request.toBytes());
             } catch (final ClosedChannelException e) {
@@ -411,7 +413,6 @@ public class Agent implements HandlerFactory, IAgentControl {
                 cancelled = true;
             }
         }
-
         final StartupAnswer startup = (StartupAnswer)answer;
         if (!startup.getResult()) {
             s_logger.error("Not allowed to connect to the server: " + answer.getDetails());
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index 37f294c31dc..453b4b60322 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -165,7 +165,7 @@ public class RegisterIsoCmd extends BaseCmd {
     }
 
     public Boolean isDynamicallyScalable() {
-        return isDynamicallyScalable ==  null ? false : isDynamicallyScalable;
+        return isDynamicallyScalable ==  null ? Boolean.FALSE : isDynamicallyScalable;
     }
 
     /////////////////////////////////////////////////////
diff --git a/awsapi/src/com/cloud/bridge/model/MHostVO.java b/awsapi/src/com/cloud/bridge/model/MHostVO.java
index a15063de1fa..9fdbde3ced5 100644
--- a/awsapi/src/com/cloud/bridge/model/MHostVO.java
+++ b/awsapi/src/com/cloud/bridge/model/MHostVO.java
@@ -127,7 +127,7 @@ public class MHostVO implements Serializable {
         if (!(other instanceof MHostVO))
             return false;
 
-        return hostKey == ((MHostVO)other).getHostKey();
+        return hostKey.equals(((MHostVO)other).getHostKey());
     }
 
     @Override