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: Prevent NPE on disk offering search while listing VMs (#6287)

Browse Source
This commit is contained in:
Nicolas Vazquez 2022-04-20 11:11:40 -03:00 committed by GitHub
parent 56fb7ac128
commit 5cf8064467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/com/cloud/api/ApiDBUtils.java
View File

@ -1052,8 +1052,11 @@ public class ApiDBUtils {
} }
public static DiskOfferingVO findDiskOfferingById(Long diskOfferingId) { public static DiskOfferingVO findDiskOfferingById(Long diskOfferingId) {
if (diskOfferingId == null) {
return null;
}
DiskOfferingVO off = s_diskOfferingDao.findByIdIncludingRemoved(diskOfferingId); DiskOfferingVO off = s_diskOfferingDao.findByIdIncludingRemoved(diskOfferingId);
if (!off.isComputeOnly()) { if (off != null && !off.isComputeOnly()) {
return off; return off;
} }
return null; return null;