You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/21 22:45:19 UTC
[39/51] [abbrv] git commit: refs/heads/ui-quick-view-v2 - use correct
disk offering id
use correct disk offering id
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/621a7794
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/621a7794
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/621a7794
Branch: refs/heads/ui-quick-view-v2
Commit: 621a779446c44b996a8cd0f98dc6447afbebeacf
Parents: 0b86b33
Author: Edison Su <su...@gmail.com>
Authored: Thu Feb 7 14:57:06 2013 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Feb 21 11:22:49 2013 -0800
----------------------------------------------------------------------
.../storage/motion/AncientDataMotionStrategy.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/621a7794/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index d686336..70f65c7 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -282,10 +282,10 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
}
protected String cloneVolume(DataObject template, DataObject volume) {
-
- DiskOfferingVO offering = diskOfferingDao.findById(volume.getId());
- VMTemplateStoragePoolVO tmpltStoredOn = templatePoolDao.findByPoolTemplate(template.getDataStore().getId(), template.getId());
VolumeInfo volInfo = (VolumeInfo)volume;
+ DiskOfferingVO offering = diskOfferingDao.findById(volInfo.getDiskOfferingId());
+ VMTemplateStoragePoolVO tmpltStoredOn = templatePoolDao.findByPoolTemplate(template.getDataStore().getId(), template.getId());
+
DiskProfile diskProfile = new DiskProfile(volInfo, offering,
null);
CreateCommand cmd = new CreateCommand(diskProfile,