Sergey Gotliv has uploaded a new change for review. Change subject: engine: Fix NPE in UpdateVmDiskCommand ......................................................................
engine: Fix NPE in UpdateVmDiskCommand The patch http://gerrit.ovirt.org/#/c/19446/ introduces a change which set quota_id as NULL instead of Guid.Empty. It causes NullPointerException in UpdateVmDiskCommand. Change-Id: If689b77cfe4b4a466b70cd9194e99f0eeafcca09 Bug-Url: https://bugzilla.redhat.com/1015872 Signed-off-by: Sergey Gotliv <sgot...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/19898/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index b3a94e2..57980b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -39,6 +39,7 @@ import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; +import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -476,8 +477,11 @@ } private boolean shouldUpdateImageProperties() { - return (getOldDisk().getDiskStorageType() == DiskStorageType.IMAGE) && - !((DiskImage) getOldDisk()).getQuotaId().equals(getQuotaId()); + if (getOldDisk().getDiskStorageType() == DiskStorageType.IMAGE) { + return false; + } + Guid oldQuotaId = ((DiskImage) getOldDisk()).getQuotaId(); + return !ObjectUtils.objectsEqual(oldQuotaId, getQuotaId()); } private boolean isAtLeastOneVmIsNotDown(List<VM> vmsDiskPluggedTo) { -- To view, visit http://gerrit.ovirt.org/19898 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If689b77cfe4b4a466b70cd9194e99f0eeafcca09 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
