Repository: cloudstack Updated Branches: refs/heads/master d26e5163d -> e4d6cd8e6
Fixed coverity reported concurrency issues Signed-off-by: Santhosh Edukulla <santhosh.eduku...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e4d6cd8e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e4d6cd8e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e4d6cd8e Branch: refs/heads/master Commit: e4d6cd8e6a0172d1b2223de13f2ab367f58d8a0b Parents: d26e516 Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Tue Aug 5 12:13:45 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Tue Aug 5 12:16:08 2014 +0530 ---------------------------------------------------------------------- core/src/com/cloud/resource/ServerResourceBase.java | 4 ++-- .../com/cloud/agent/manager/AgentManagerImpl.java | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4d6cd8e/core/src/com/cloud/resource/ServerResourceBase.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java index d3992a3..082067f 100755 --- a/core/src/com/cloud/resource/ServerResourceBase.java +++ b/core/src/com/cloud/resource/ServerResourceBase.java @@ -236,7 +236,7 @@ public abstract class ServerResourceBase implements ServerResource { } protected List<String> getWarnings() { - synchronized (this) { + synchronized (_warnings) { final ArrayList<String> results = _warnings; _warnings = new ArrayList<String>(); return results; @@ -244,7 +244,7 @@ public abstract class ServerResourceBase implements ServerResource { } protected List<String> getErrors() { - synchronized (this) { + synchronized (_errors) { final ArrayList<String> result = _errors; _errors = new ArrayList<String>(); return result; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4d6cd8e/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index 7dd948a..847e000 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -577,21 +577,6 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl return attache; } - protected boolean notifyCreatorsOfConnection(StartupCommand[] cmd) throws ConnectionException { - boolean handled = false; - for (Pair<Integer, StartupCommandProcessor> monitor : _creationMonitors) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Sending Connect to creator: " + monitor.second().getClass().getSimpleName()); - } - handled = monitor.second().processInitialConnect(cmd); - if (handled) { - break; - } - } - - return handled; - } - @Override public boolean start() { startDirectlyConnectedHosts();
