From b7d3f1bd307a67b4d46dc29093d6845c3bcc333e Mon Sep 17 00:00:00 2001 From: Santhosh Edukulla Date: Mon, 4 Aug 2014 16:00:36 +0530 Subject: [PATCH] Fixed few coverity issues for resource synchronization --- .../src/com/cloud/agent/manager/AgentManagerImpl.java | 4 +--- server/src/com/cloud/resource/ResourceManagerImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index af2d1b94399..7dd948a3493 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -272,15 +272,13 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl public int registerForInitialConnects(final StartupCommandProcessor creator, boolean priority) { synchronized (_hostMonitors) { _monitorId++; - if (priority) { _creationMonitors.add(0, new Pair(_monitorId, creator)); } else { _creationMonitors.add(new Pair(_monitorId, creator)); } + return _monitorId; } - - return _monitorId; } @Override diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 6f089af957a..50086212cf3 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1438,11 +1438,10 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, @Override public void registerResourceStateAdapter(String name, ResourceStateAdapter adapter) { - if (_resourceStateAdapters.get(name) != null) { - throw new CloudRuntimeException(name + " has registered"); - } - synchronized (_resourceStateAdapters) { + if (_resourceStateAdapters.get(name) != null) { + throw new CloudRuntimeException(name + " has registered"); + } _resourceStateAdapters.put(name, adapter); } }