Gilad Chaplik has uploaded a new change for review. Change subject: core: NPE in RestoreAllSnapshotsCommand (#854895) ......................................................................
core: NPE in RestoreAllSnapshotsCommand (#854895) https://bugzilla.redhat.com/854895 storagePoolId was never set in the command, caused QuotaManager to throw a NPE. Change-Id: Ibb15567b647fd9a898bb645264e69cdf896fdbae Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/7896/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index 890459b..1592f75 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -8,10 +8,10 @@ import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.quota.QuotaManager; -import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; -import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.quota.Quotable; +import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; +import org.ovirt.engine.core.bll.utils.PermissionSubject; +import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; import org.ovirt.engine.core.common.action.RemoveImageParameters; import org.ovirt.engine.core.common.action.RestoreAllSnapshotsParameters; @@ -343,6 +343,10 @@ @Override public void rollbackQuota() { + if (getImagesList().isEmpty()) { + return; + } + setStoragePoolId(getImagesList().get(0).getstorage_pool_id()); for (DiskImage image : getImagesList()) { Guid quotaId = image.getQuotaId(); if (quotaId != null) { -- To view, visit http://gerrit.ovirt.org/7896 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb15567b647fd9a898bb645264e69cdf896fdbae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
