(cloudstack) branch 4.20 updated: Fix NPE on primary storage delete (#11817)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 03d24ff851d Fix NPE on primary storage delete (#11817)
03d24ff851d is described below

commit 03d24ff851d491dbc0145014b4bd967371127c50
Author: Henrique Sato <henriquesato2...@gmail.com>
AuthorDate: Tue Jan 20 04:12:16 2026 -0300

    Fix NPE on primary storage delete (#11817)
---
 server/src/main/java/com/cloud/storage/StorageManagerImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java 
b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 8b5e0b24f48..8392c85527d 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -1558,14 +1558,18 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
 
     protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
         StringBuilder sb = new StringBuilder();
-        List<VolumeVO> nonDestroyedVols = 
volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> 
vol.getState() != Volume.State.Destroy).collect(Collectors.toList());
+        List<VolumeVO> nonDestroyedVols = 
volumeDao.findByPoolId(storagePoolId, null);
         VMInstanceVO volInstance;
         List<String> logMessageInfo = new ArrayList<>();
 
         sb.append("[");
         for (VolumeVO vol : nonDestroyedVols) {
             volInstance = _vmInstanceDao.findById(vol.getInstanceId());
-            logMessageInfo.add(String.format("Volume [%s] (attached to VM 
[%s])", vol.getUuid(), volInstance.getUuid()));
+            if (volInstance != null) {
+                logMessageInfo.add(String.format("Volume [%s] (attached to VM 
[%s])", vol.getUuid(), volInstance.getUuid()));
+            } else {
+                logMessageInfo.add(String.format("Volume [%s]", 
vol.getUuid()));
+            }
         }
         sb.append(String.join(", ", logMessageInfo));
         sb.append("]");