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:24:22 UTC
git commit: updated refs/heads/master to 70c9781
Updated Branches:
refs/heads/master e6127a7c0 -> 70c9781e9
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/70c9781e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70c9781e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70c9781e
Branch: refs/heads/master
Commit: 70c9781e9c35097d146d0acc3126cfd5b63e6391
Parents: e6127a7
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:20:30 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/70c9781e/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 afaa5b0..f545d2c 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1633,7 +1633,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());
}
@@ -1643,11 +1643,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);