etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster 

fixed typo
This commit is contained in:
Anthony Xu 2013-12-06 01:15:56 -08:00
parent e6127a7c00
commit 70c9781e9c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -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);