Repository: cloudstack Updated Branches: refs/heads/4.4 13ba59c5f -> e796d885f
CLOUDSTACK-6660: Dont assume every vm will have a root volume now. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e796d885 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e796d885 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e796d885 Branch: refs/heads/4.4 Commit: e796d885f393343340baac96090bc254021d97fb Parents: 13ba59c Author: Nitin Mehta <[email protected]> Authored: Wed May 14 14:59:54 2014 -0700 Committer: Daan Hoogland <[email protected]> Committed: Thu May 15 08:46:30 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e796d885/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 9fa4353..e7db877 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -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); + } }
