etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-29 20:38:34 -07:00
parent cf69ee0b0d 5c88bb936b
commit a1293ea882
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -613,7 +613,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
String guid = details.get("guid");
List<HostVO> kvmHosts = _hostDao.listBy(Host.Type.Routing, clusterId, podId, dcId);
for (HostVO host: kvmHosts) {
if (host.getGuid() == guid) {
if (host.getGuid().equalsIgnoreCase(guid)) {
hosts.add(host);
return hosts;
}

2
server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
View File

@ -253,7 +253,7 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
for (int i = 0; i < _waitTime; i++) {
List<HostVO> hosts = _hostDao.listBy(Host.Type.Routing, clusterId, podId, dcId);
for (HostVO host : hosts) {
if (host.getGuid() == guid) {
if (host.getGuid().equalsIgnoreCase(guid)) {
return host;
}
}