cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/9] git commit: updated refs/heads/internallb to def0861
Date Thu, 09 May 2013 18:00:39 GMT
Updated Branches:
  refs/heads/internallb d828c154f -> def0861d5


Made a cast so we don't get warnings


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c597476
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c597476
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c597476

Branch: refs/heads/internallb
Commit: 3c59747635bd859bc0db6aa1f4ede6a37732237f
Parents: 738d35a
Author: Alex Huang <alex.huang@gmail.com>
Authored: Wed May 8 15:37:29 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Wed May 8 15:38:00 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/resource/ResourceManagerImpl.java    |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c597476/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index c9c3f9c..0ab35dd 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -30,7 +30,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.dc.*;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
@@ -74,6 +73,13 @@ import com.cloud.cluster.ManagementServerNode;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.dao.ConfigurationDao;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.ClusterDetailsVO;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenterIpAddressVO;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.HostPodVO;
+import com.cloud.dc.PodCluster;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.ClusterVSMMapDao;
 import com.cloud.dc.dao.DataCenterDao;
@@ -1638,10 +1644,10 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 	private Object dispatchToStateAdapters(ResourceStateAdapter.Event event,
 			boolean singleTaker, Object... args) {
         synchronized (_resourceStateAdapters) {
-            Iterator it = _resourceStateAdapters.entrySet().iterator();
+            Iterator<Map.Entry<String, ResourceStateAdapter>> it = _resourceStateAdapters.entrySet().iterator();
             Object result = null;
             while (it.hasNext()) {
-				Map.Entry<String, ResourceStateAdapter> item = (Map.Entry<String, ResourceStateAdapter>)
it
+				Map.Entry<String, ResourceStateAdapter> item = it
 						.next();
                 ResourceStateAdapter adapter = item.getValue();
 


Mime
View raw message