Daniel Erez has uploaded a new change for review. Change subject: restapi: avoid npe on vm disk creation without domain ......................................................................
restapi: avoid npe on vm disk creation without domain Modified 'BackendVmDisksResource -> add()' to avoid an NPE when creating a disk without a specified storage domain. Change-Id: I34eaeec901ebcdbaaf49f4224eb1f1dfa4279cb1 Bug-Url: https://bugzilla.redhat.com/1220824 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/40826/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java index ee08b07..344676c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java @@ -64,16 +64,23 @@ .build(); }else { validateDiskForCreation(disk); - org.ovirt.engine.core.common.businessentities.StorageDomain storageDomain = getStorageDomainById(getStorageDomainId(disk)); - if (storageDomain != null) { - disk.setStorageType(DiskMapper.map(storageDomain.getStorageDomainType()).value()); - } + updateStorageTypeForDisk(disk); return performCreate(addAction, getAddParameters(map(disk), disk), getEntityIdResolver(disk.getName())); } } + protected void updateStorageTypeForDisk(Disk disk) { + Guid storageDomainId = getStorageDomainId(disk); + if (storageDomainId != null) { + org.ovirt.engine.core.common.businessentities.StorageDomain storageDomain = getStorageDomainById(storageDomainId); + if (storageDomain != null) { + disk.setStorageType(DiskMapper.map(storageDomain.getStorageDomainType()).value()); + } + } + } + @Override public Response remove(String id, Action action) { getEntity(id); //verifies that entity exists, returns 404 otherwise. -- To view, visit https://gerrit.ovirt.org/40826 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34eaeec901ebcdbaaf49f4224eb1f1dfa4279cb1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
