From afb31fa09f92930ab3fee40cd08a15a48152cb15 Mon Sep 17 00:00:00 2001
From: Nitin Mehta <nitin.mehta@citrix.com>
Date: Wed, 14 May 2014 14:59:54 -0700
Subject: [PATCH] CLOUDSTACK-6660: Dont assume every vm will have a root volume
 now. (cherry picked from commit 076bbdcfe86d6886ab1ecfc513b02a323a995307)

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index d323e985da3..a563fad02eb 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);
+            }
 
         }