apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on one of the register disk usecases

Browse Source
This commit is contained in:
Harikrishna Patnala 2020-07-23 00:53:39 +05:30
parent 873f9dd9ac
commit 0335713738
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -2595,13 +2595,13 @@ public class VirtualMachineMO extends BaseMO {
VirtualDeviceBackingInfo backingInfo = ((VirtualDisk)device).getBacking(); VirtualDeviceBackingInfo backingInfo = ((VirtualDisk)device).getBacking();
if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) { if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo; VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
String diskBackingFileName = diskBackingInfo.getFileName();
while (diskBackingInfo != null) { while (diskBackingInfo != null) {
String deviceBusName = getDeviceBusName(devices, device); String deviceBusName = getDeviceBusName(devices, device);
builder.addDisk(deviceBusName, diskBackingInfo.getFileName()); builder.addDisk(deviceBusName, diskBackingInfo.getFileName());
diskBackingInfo = diskBackingInfo.getParent(); diskBackingInfo = diskBackingInfo.getParent();
} }
DatastoreFile dsBackingFile = new DatastoreFile(diskBackingInfo.getFileName()); DatastoreFile dsBackingFile = new DatastoreFile(diskBackingFileName);
registerVirtualDisk((VirtualDisk) device, dsBackingFile); registerVirtualDisk((VirtualDisk) device, dsBackingFile);
} }
} }