diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java index 290f1afd90f..882084b48b9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java @@ -27,7 +27,7 @@ public interface LegacyZoneDao extends GenericDao { * @param zoneId - id of zone * @return Object of legacy zone (LegacyZoneVO) identified by zoneId */ - LegacyZoneVO findByZoneId(String zoneId); + LegacyZoneVO findByZoneId(Long zoneId); /** * Lists all legacy CloudStack zones diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java index 20d68b0b8d1..dc121a11889 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java @@ -51,16 +51,16 @@ } @Override - public LegacyZoneVO findByZoneId(String zoneId) { + public LegacyZoneVO findByZoneId(Long zoneId) { SearchCriteria sc = zoneSearch.create(); sc.setParameters("zoneId", zoneId); return findOneBy(sc); } @Override - public List listAllLegacyZones() { + public List listAllLegacyZones() { SearchCriteria sc = fullTableSearch.create(); return search(sc, null); - } + } } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 028fa942d57..ce794b1f46c 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1240,7 +1240,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw @Override public boolean isLegacyZone(long dcId) { boolean isLegacyZone = false; - LegacyZoneVO legacyZoneVo = _legacyZoneDao.findById(dcId); + LegacyZoneVO legacyZoneVo = _legacyZoneDao.findByZoneId(dcId); if (legacyZoneVo != null) { isLegacyZone = true; }