From 1272347f0878c52f4d606b500e43931fa2919100 Mon Sep 17 00:00:00 2001
From: "ye.zou" <ye.zou@zstack.io>
Date: Sat, 2 May 2026 23:18:51 +0800
Subject: [PATCH] <fix>[compute]: skip null DiskOfferingVO for candidate PS
 query

Resolves: ZSTAC-80709

Change-Id: I03f8705c7accba537036132b04dc91b6141f81ef
---
 .../org/zstack/compute/vm/VmInstanceManagerImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java
index 321c7b3325d..1bd5dfeed58 100755
--- a/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java
+++ b/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java
@@ -804,11 +804,12 @@ protected ImageInventory scripts() {
                         .list());
 
                 for (String diskUuid : dataOfferingUuids){
-                    dataOfferings.add(DiskOfferingInventory.valueOf(
-                            (DiskOfferingVO) q(DiskOfferingVO.class)
-                                    .eq(DiskOfferingVO_.uuid, diskUuid)
-                                    .find()
-                    ));
+                    DiskOfferingVO dvo = q(DiskOfferingVO.class)
+                            .eq(DiskOfferingVO_.uuid, diskUuid)
+                            .find();
+                    if (dvo != null) {
+                        dataOfferings.add(DiskOfferingInventory.valueOf(dvo));
+                    }
                 }
 
                 ImageVO imageVO = q(ImageVO.class).eq(ImageVO_.uuid, msg.getImageUuid()).find();