You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/12/06 10:19:53 UTC
git commit: updated refs/heads/4.3 to 65642e9
Updated Branches:
refs/heads/4.3 bc86103c2 -> 65642e98b
XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
fixed typo
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65642e98
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65642e98
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65642e98
Branch: refs/heads/4.3
Commit: 65642e98b70ef2690af93c0121842a365f2ade6e
Parents: bc86103
Author: Anthony Xu <an...@citrix.com>
Authored: Fri Dec 6 01:15:56 2013 -0800
Committer: Anthony Xu <an...@citrix.com>
Committed: Fri Dec 6 01:16:11 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65642e98/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 25aace9..7aab492 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1645,7 +1645,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
Long vmId = volume.getInstanceId();
if ( vmId != null ) {
UserVmVO userVm = _userVmDao.findById(vmId);
- if (userVm == null) {
+ if (userVm != null) {
_userVmDao.loadDetails(userVm);
details.putAll(userVm.getDetails());
}
@@ -1655,11 +1655,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
details.putAll(cmd.getDetails());
}
if( !details.isEmpty()) {
- List<VMTemplateDetailVO> tdetails = new ArrayList<VMTemplateDetailVO>();
- for (String key : details.keySet()) {
- tdetails.add(new VMTemplateDetailVO(template.getId(), key, details.get(key)));
- }
- this._templateDetailsDao.saveDetails(tdetails);
+ privateTemplate.setDetails(details);
+ _tmpltDao.saveDetails(privateTemplate);
}
_resourceLimitMgr.incrementResourceCount(templateOwner.getId(), ResourceType.template);