Skip to content

Commit 03ca329

Browse files
NPE fix while deleting storage pool when pool has detached volumes
1 parent f1f779a commit 03ca329

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,8 +1564,10 @@ protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
15641564

15651565
sb.append("[");
15661566
for (VolumeVO vol : nonDestroyedVols) {
1567-
volInstance = _vmInstanceDao.findById(vol.getInstanceId());
1568-
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1567+
if (vol.getInstanceId() != null) {
1568+
volInstance = _vmInstanceDao.findById(vol.getInstanceId());
1569+
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1570+
}
15691571
}
15701572
sb.append(String.join(", ", logMessageInfo));
15711573
sb.append("]");

0 commit comments

Comments
 (0)