Daniel Erez has posted comments on this change. Change subject: core: Fix NPE when scanning for non-existent domain. ......................................................................
Patch Set 4: (3 comments) http://gerrit.ovirt.org/#/c/26207/4/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java: Line 22: Guid storagePoolId = getParameters().getStoragePoolId(); Line 23: Guid storageDomainId = getParameters().getStorageDomainId(); Line 24: Guid diskId = getParameters().getDiskId(); Line 25: if (getDbFacade().getStorageDomainDao().getForStoragePool(storageDomainId, storagePoolId) == null) { Line 26: getQueryReturnValue().setExceptionString("Storage Domain does not exist in the Data Center"); extract to VdcBllMessages Line 27: getQueryReturnValue().setSucceeded(false); Line 28: return; Line 29: } Line 30: http://gerrit.ovirt.org/#/c/26207/4/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDisksQuery.java: Line 25: protected void executeQueryCommand() { Line 26: // first, run getImagesList query into vdsm to get all of the images on the storage domain - then store in Line 27: // imagesList Line 28: VDSBrokerFrontend vdsBroker = getVdsBroker(); Line 29: if (getDbFacade().getStorageDomainDao().getForStoragePool(getStorageDomainId(), getStoragePoolId()) == null) { check if can be extracted to a common place Line 30: getQueryReturnValue().setExceptionString("Storage Domain does not exist in the Data Center"); Line 31: getQueryReturnValue().setSucceeded(false); Line 32: return; Line 33: } Line 26: // first, run getImagesList query into vdsm to get all of the images on the storage domain - then store in Line 27: // imagesList Line 28: VDSBrokerFrontend vdsBroker = getVdsBroker(); Line 29: if (getDbFacade().getStorageDomainDao().getForStoragePool(getStorageDomainId(), getStoragePoolId()) == null) { Line 30: getQueryReturnValue().setExceptionString("Storage Domain does not exist in the Data Center"); same Line 31: getQueryReturnValue().setSucceeded(false); Line 32: return; Line 33: } Line 34: VDSReturnValue imagesListResult = vdsBroker.RunVdsCommand(VDSCommandType.GetImagesList, -- To view, visit http://gerrit.ovirt.org/26207 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c722ca3b003efd89ae5207bc941d6926b5f052c Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Daniel Erez <de...@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipc...@redhat.com> Gerrit-Reviewer: Ori Liel <ol...@redhat.com> Gerrit-Reviewer: Tal Nisan <tni...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches