Fix: Prevent NPE on disk offering search while listing VMs (apache#6287)

iranmanesh · Apr 20, 2022 · 5cf8064 · 5cf8064
1 parent 56fb7ac
commit 5cf8064
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -1052,8 +1052,11 @@ public static DiskOfferingVO findComputeOnlyDiskOfferingById(Long diskOfferingId
     }
 
     public static DiskOfferingVO findDiskOfferingById(Long diskOfferingId) {
+        if (diskOfferingId == null) {
+            return null;
+        }
         DiskOfferingVO off = s_diskOfferingDao.findByIdIncludingRemoved(diskOfferingId);
-        if (!off.isComputeOnly()) {
+        if (off != null && !off.isComputeOnly()) {
             return off;
         }
         return null;