Fixed few coverity issues for resource synchronization

sedukull · sedukull · commit b7d3f1bd307a · 2014-08-04T16:09:26.000+05:30
diff --git 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 int registerForHostEvents(final Listener listener, boolean connections, b
     public int registerForInitialConnects(final StartupCommandProcessor creator, boolean priority) {
         synchronized (_hostMonitors) {
             _monitorId++;
-
             if (priority) {
                 _creationMonitors.add(0, new Pair<Integer, StartupCommandProcessor>(_monitorId, creator));
             } else {
                 _creationMonitors.add(new Pair<Integer, StartupCommandProcessor>(_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
@@ -1438,11 +1438,10 @@ public HypervisorType getAvailableHypervisor(long zoneId) {
 
     @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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -272,15 +272,13 @@ public int registerForHostEvents(final Listener listener, boolean connections, b`
`272`	`272`	`public int registerForInitialConnects(final StartupCommandProcessor creator, boolean priority) {`
`273`	`273`	`synchronized (_hostMonitors) {`
`274`	`274`	`_monitorId++;`
`275`		`-`
`276`	`275`	`if (priority) {`
`277`	`276`	`_creationMonitors.add(0, new Pair<Integer, StartupCommandProcessor>(_monitorId, creator));`
`278`	`277`	`} else {`
`279`	`278`	`_creationMonitors.add(new Pair<Integer, StartupCommandProcessor>(_monitorId, creator));`
`280`	`279`	`}`
	`280`	`+ return _monitorId;`
`281`	`281`	`}`
`282`		`-`
`283`		`- return _monitorId;`
`284`	`282`	`}`
`285`	`283`
`286`	`284`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1438,11 +1438,10 @@ public HypervisorType getAvailableHypervisor(long zoneId) {`
`1438`	`1438`
`1439`	`1439`	`@Override`
`1440`	`1440`	`public void registerResourceStateAdapter(String name, ResourceStateAdapter adapter) {`
`1441`		`- if (_resourceStateAdapters.get(name) != null) {`
`1442`		`- throw new CloudRuntimeException(name + " has registered");`
`1443`		`- }`
`1444`		`-`
`1445`	`1441`	`synchronized (_resourceStateAdapters) {`
	`1442`	`+ if (_resourceStateAdapters.get(name) != null) {`
	`1443`	`+ throw new CloudRuntimeException(name + " has registered");`
	`1444`	`+ }`
`1446`	`1445`	`_resourceStateAdapters.put(name, adapter);`
`1447`	`1446`	`}`
`1448`	`1447`	`}`