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

CLOUDSTACK-6660: Dont assume every vm will have a root volume now. 

(cherry picked from commit 076bbdcfe8)
This commit is contained in:
Nitin Mehta 2014-05-14 14:59:54 -07:00
parent 8d9bdb19b4
commit afb31fa09f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1854,7 +1854,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
saveUsageEvent(vmInstance);
// take care of the root volume as well.
_volumeService.updateDisplay(_volsDao.findByInstanceAndType(id, Volume.Type.ROOT).get(0), isDisplayVm);
List<VolumeVO> rootVols = _volsDao.findByInstanceAndType(id, Volume.Type.ROOT);
if(!rootVols.isEmpty()){
_volumeService.updateDisplay(rootVols.get(0), isDisplayVm);
}
// take care of the data volumes as well.
List<VolumeVO> dataVols = _volsDao.findByInstanceAndType(id, Volume.Type.DATADISK);
for(Volume dataVol : dataVols){
_volumeService.updateDisplay(dataVol, isDisplayVm);
}
}