Merge pull request apache#830 from sureshanaparti/CLOUDSTACK-8858

yadvr · yadvr · commit f280bbe9e4cd · 2016-01-27T15:56:07.000+01:00
CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.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.

* pr/830:
  CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.

Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -81,22 +81,28 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
         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 {
                 volResponse.setVirtualMachineDisplayName(volume.getVmName());
             }
         }
 
-        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());
@@ -105,7 +111,9 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
         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(),
