Maor Lipchuk has uploaded a new change for review. Change subject: core: Check return value from getUnregisteredDisks ......................................................................
core: Check return value from getUnregisteredDisks if GetUnregisteredDisks fails to get the imagesList from VDSM, the query returns null. In this patch I've added a check so in case we will get a null value for the unregistered disks we should print an error and return an empty list of unregistered disks Change-Id: I9a2c2b75d7d8cea782e1b91cf5d34666642d1800 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/40368/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index a298054..9b7dc50 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -430,6 +430,11 @@ List<Disk> unregisteredDisks = getBackend().runInternalQuery(VdcQueryType.GetUnregisteredDisks, new GetUnregisteredDisksQueryParameters(storageDomainId, storagePoolId)).getReturnValue(); + if (unregisteredDisks == null) { + log.error("An error occurred while fetching unregistered disks from Storage Domain id '{}'", + storageDomainId); + return ovfDisks; + } for (Disk disk : unregisteredDisks) { DiskImage ovfStoreDisk = (DiskImage) disk; String diskDecription = ovfStoreDisk.getDescription(); -- To view, visit https://gerrit.ovirt.org/40368 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a2c2b75d7d8cea782e1b91cf5d34666642d1800 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
