From 5fc6d74b951c08a8407bf61b6367cd04e859b492 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Jun 2011 20:36:02 -0700 Subject: [PATCH] fixed template deletion --- server/src/com/cloud/template/HyervisorTemplateAdapter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/template/HyervisorTemplateAdapter.java b/server/src/com/cloud/template/HyervisorTemplateAdapter.java index b487e205efd..81345a84df0 100644 --- a/server/src/com/cloud/template/HyervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HyervisorTemplateAdapter.java @@ -126,8 +126,7 @@ public class HyervisorTemplateAdapter extends TemplateAdapterBase implements Tem if (!template.isCrossZones() && zoneId != null) { DataCenterVO zone = _dcDao.findById(zoneId); zoneName = zone.getName(); - secondaryStorageHosts = new ArrayList(); - secondaryStorageHosts.add(_hostDao.findSecondaryStorageHost(zoneId)); + secondaryStorageHosts = _hostDao.listSecondaryStorageHosts(zoneId); } else { zoneName = "(all zones)"; secondaryStorageHosts = _hostDao.listSecondaryStorageHosts(); @@ -171,8 +170,7 @@ public class HyervisorTemplateAdapter extends TemplateAdapterBase implements Tem success = false; break; } - - templateHostVO.setDestroyed(true); + templateHostVO.setDestroyed(true); _tmpltHostDao.update(templateHostVO.getId(), templateHostVO); VMTemplateZoneVO templateZone = _tmpltZoneDao.findByZoneTemplate(sZoneId, templateId);