Maor Lipchuk has uploaded a new change for review. Change subject: core: Check if storage domain exists in OVF_STORE ......................................................................
core: Check if storage domain exists in OVF_STORE To prevent NPE when checking Storage Domain for OVF_STORE, I've added a check if the storage domain exists in the description of the OVF_STORE disk. Change-Id: I14e270db122619e2eeb55cb580f4a3e4a310e5be 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, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/40367/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 8cfe6cf..a298054 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 @@ -598,6 +598,9 @@ } private boolean isDomainExistsInDiskDescription(Map<String, Object> map, Guid storageDomainId) { + if (map.get(OvfInfoFileConstants.Domains) == null) { + return false; + } return map.get(OvfInfoFileConstants.Domains).toString().contains(storageDomainId.toString()); } -- To view, visit https://gerrit.ovirt.org/40367 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14e270db122619e2eeb55cb580f4a3e4a310e5be 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
