apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed coveirty defects for concurrency, variable comparison etc

Browse Source 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
This commit is contained in:
Santhosh Edukulla 2014-08-14 18:31:11 +05:30
parent c90bf1231f
commit 4825017cc7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/src/com/cloud/agent/Agent.java
View File

@ -294,6 +294,11 @@ public class Agent implements HandlerFactory, IAgentControl {
_watchList.clear(); _watchList.clear();
} }
} }
public synchronized void lockStartupTask(Link link)
{
_startup = new StartupTask(link);
_timer.schedule(_startup, _startupWait);
}
public void sendStartup(Link link) { public void sendStartup(Link link) {
final StartupCommand[] startup = _resource.initialize(); final StartupCommand[] startup = _resource.initialize();
@ -309,10 +314,7 @@ public class Agent implements HandlerFactory, IAgentControl {
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Sending Startup: " + request.toString()); s_logger.debug("Sending Startup: " + request.toString());
} }
synchronized (this) { lockStartupTask(link);
_startup = new StartupTask(link);
_timer.schedule(_startup, _startupWait);
}
try { try {
link.send(request.toBytes()); link.send(request.toBytes());
} catch (final ClosedChannelException e) { } catch (final ClosedChannelException e) {
@ -411,7 +413,6 @@ public class Agent implements HandlerFactory, IAgentControl {
cancelled = true; cancelled = true;
} }
} }
final StartupAnswer startup = (StartupAnswer)answer; final StartupAnswer startup = (StartupAnswer)answer;
if (!startup.getResult()) { if (!startup.getResult()) {
s_logger.error("Not allowed to connect to the server: " + answer.getDetails()); s_logger.error("Not allowed to connect to the server: " + answer.getDetails());

2
api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
View File

@ -165,7 +165,7 @@ public class RegisterIsoCmd extends BaseCmd {
} }
public Boolean isDynamicallyScalable() { public Boolean isDynamicallyScalable() {
return isDynamicallyScalable == null ? false : isDynamicallyScalable; return isDynamicallyScalable == null ? Boolean.FALSE : isDynamicallyScalable;
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////

2
awsapi/src/com/cloud/bridge/model/MHostVO.java
View File

@ -127,7 +127,7 @@ public class MHostVO implements Serializable {
if (!(other instanceof MHostVO)) if (!(other instanceof MHostVO))
return false; return false;
return hostKey == ((MHostVO)other).getHostKey(); return hostKey.equals(((MHostVO)other).getHostKey());
} }
@Override @Override