From 5cf8064467667f2a87d0f6f2ad2d0762df0800fb Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Wed, 20 Apr 2022 11:11:40 -0300
Subject: [PATCH] Fix: Prevent NPE on disk offering search while listing VMs
 (#6287)

---
 server/src/main/java/com/cloud/api/ApiDBUtils.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
index 9a29eb46c42..221202f7a9c 100644
--- 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 class ApiDBUtils {
     }
 
     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;