ApiResponseHelper: fix NPE when parent of snapshot is null

yadvr · yadvr · commit 1cf165f86df7 · 2015-02-05T17:10:56.000+05:30
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -500,7 +500,10 @@ public VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot) {
             vmSnapshotResponse.setVirtualMachineid(vm.getUuid());
         }
         if (vmSnapshot.getParent() != null) {
-            vmSnapshotResponse.setParentName(ApiDBUtils.getVMSnapshotById(vmSnapshot.getParent()).getDisplayName());
+            VMSnapshot vmSnapshotParent = ApiDBUtils.getVMSnapshotById(vmSnapshot.getParent());
+            if (vmSnapshotParent != null) {
+                vmSnapshotResponse.setParentName(vmSnapshotParent.getDisplayName());
+            }
         }
         vmSnapshotResponse.setCurrent(vmSnapshot.getCurrent());
         vmSnapshotResponse.setType(vmSnapshot.getType().toString());

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,10 @@ public VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot) {`
`500`	`500`	`vmSnapshotResponse.setVirtualMachineid(vm.getUuid());`
`501`	`501`	`}`
`502`	`502`	`if (vmSnapshot.getParent() != null) {`
`503`		`- vmSnapshotResponse.setParentName(ApiDBUtils.getVMSnapshotById(vmSnapshot.getParent()).getDisplayName());`
	`503`	`+ VMSnapshot vmSnapshotParent = ApiDBUtils.getVMSnapshotById(vmSnapshot.getParent());`
	`504`	`+ if (vmSnapshotParent != null) {`
	`505`	`+ vmSnapshotResponse.setParentName(vmSnapshotParent.getDisplayName());`
	`506`	`+ }`
`504`	`507`	`}`
`505`	`508`	`vmSnapshotResponse.setCurrent(vmSnapshot.getCurrent());`
`506`	`509`	`vmSnapshotResponse.setType(vmSnapshot.getType().toString());`