You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/10 22:55:52 UTC
[2/50] [abbrv] git commit: only check ISO which is downloaded status
only check ISO which is downloaded status
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/04429173
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/04429173
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/04429173
Branch: refs/heads/4.0
Commit: 0442917381a573d11d70507d452bdeb43787a6bc
Parents: c14dcd2
Author: Anthony Xu <an...@cloud.com>
Authored: Mon Sep 10 13:30:25 2012 -0700
Committer: Anthony Xu <an...@cloud.com>
Committed: Mon Sep 10 13:30:25 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/storage/StorageManagerImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/04429173/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 50a78db..4425b71 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1098,9 +1098,10 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag
List<HostVO> storageHosts = _resourceMgr.listAllHostsInOneZoneByType(Host.Type.SecondaryStorage, dataCenterId);
if (storageHosts != null) {
for (HostVO storageHost : storageHosts) {
- VMTemplateHostVO templateHostVO = _vmTemplateHostDao.findByHostTemplate(storageHost.getId(), templateId);
- if (templateHostVO != null) {
- isoPath = storageHost.getStorageUrl() + "/" + templateHostVO.getInstallPath();
+ List<VMTemplateHostVO> templateHostVOs = _vmTemplateHostDao.listByTemplateHostStatus(templateId, storageHost.getId(), VMTemplateStorageResourceAssoc.Status.DOWNLOADED );
+ if (templateHostVOs != null && !templateHostVOs.isEmpty()) {
+ VMTemplateHostVO tmpHostVO = templateHostVOs.get(0);
+ isoPath = storageHost.getStorageUrl() + "/" + tmpHostVO.getInstallPath();
return new Pair<String, String>(isoPath, storageHost.getStorageUrl());
}
}