From 0335713738af0d9522b0c6645c404b0301821166 Mon Sep 17 00:00:00 2001
From: Harikrishna Patnala <harikrishna.patnala@gmail.com>
Date: Thu, 23 Jul 2020 00:53:39 +0530
Subject: [PATCH] Fix NPE on one of the register disk usecases

---
 .../java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 0382f21df60..3db74f317a1 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2595,13 +2595,13 @@ public class VirtualMachineMO extends BaseMO {
                     VirtualDeviceBackingInfo backingInfo = ((VirtualDisk)device).getBacking();
                     if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
                         VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
-
+                        String diskBackingFileName = diskBackingInfo.getFileName();
                         while (diskBackingInfo != null) {
                             String deviceBusName = getDeviceBusName(devices, device);
                             builder.addDisk(deviceBusName, diskBackingInfo.getFileName());
                             diskBackingInfo = diskBackingInfo.getParent();
                         }
-                        DatastoreFile dsBackingFile = new DatastoreFile(diskBackingInfo.getFileName());
+                        DatastoreFile dsBackingFile = new DatastoreFile(diskBackingFileName);
                         registerVirtualDisk((VirtualDisk) device, dsBackingFile);
                     }
                 }