From c3777632c5817cc1e635ee59eb18d6cb4f210e29 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@citrix.com>
Date: Tue, 15 Sep 2015 16:22:06 +0530
Subject: [PATCH] CLOUDSTACK-8858: listVolumes API fails for a particular
 domain with NPE.

Summary: listVolumes API fails when volume associated vm instance has NULL or invalid state. Fix the code to guard this situation since this should not block volume listing.
---
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 68a578fd218..7540d247a43 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -83,14 +83,18 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
         volResponse.setZoneId(volume.getDataCenterUuid());
         volResponse.setZoneName(volume.getDataCenterName());
 
-        volResponse.setVolumeType(volume.getVolumeType().toString());
+        if (volume.getVolumeType() != null) {
+            volResponse.setVolumeType(volume.getVolumeType().toString());
+        }
         volResponse.setDeviceId(volume.getDeviceId());
 
         long instanceId = volume.getVmId();
         if (instanceId > 0 && volume.getState() != Volume.State.Destroy) {
             volResponse.setVirtualMachineId(volume.getVmUuid());
             volResponse.setVirtualMachineName(volume.getVmName());
-            volResponse.setVirtualMachineState(volume.getVmState().toString());
+            if (volume.getVmState() != null) {
+                volResponse.setVirtualMachineState(volume.getVmState().toString());
+            }
             if (volume.getVmDisplayName() != null) {
                 volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
             } else {
@@ -98,7 +102,9 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
             }
         }
 
-        volResponse.setProvisioningType(volume.getProvisioningType().toString());
+        if (volume.getProvisioningType() != null) {
+            volResponse.setProvisioningType(volume.getProvisioningType().toString());
+        }
 
         // Show the virtual size of the volume
         volResponse.setSize(volume.getSize());
@@ -107,7 +113,9 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
         volResponse.setMaxIops(volume.getMaxIops());
 
         volResponse.setCreated(volume.getCreated());
-        volResponse.setState(volume.getState().toString());
+        if (volume.getState() != null) {
+            volResponse.setState(volume.getState().toString());
+        }
         if (volume.getState() == Volume.State.UploadOp) {
             // com.cloud.storage.VolumeHostVO volumeHostRef =
             // ApiDBUtils.findVolumeHostRef(volume.getId(),