Gilad Chaplik has uploaded a new change for review. Change subject: core: ovf_store isn't added ......................................................................
core: ovf_store isn't added When disk is added and there is no active user- currently only for ovf_store disk, disk profile permission check causes NPE. Since user is null when command is invoked by the internally, we can skip the permission check. Bug-Url: https://bugzilla.redhat.com/1185615 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> Change-Id: I0ab3247d0f80e2f5123aace3fac58bee2a8a7b8d (cherry picked from commit 6015932ec838f79a2229dcf4ff4dfd5d57a1d7e3) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/DiskProfileHelper.java 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/37269/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/DiskProfileHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/DiskProfileHelper.java index 3acbcf4..3eba525 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/DiskProfileHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/DiskProfileHelper.java @@ -92,7 +92,8 @@ private static boolean isDiskProfilePermitted(DiskProfile diskProfile, Set<Guid> permittedDiskProfilesIds, DbUser user) { - return permittedDiskProfilesIds.contains(diskProfile.getId()) + return user == null + || permittedDiskProfilesIds.contains(diskProfile.getId()) || getPermissionDAO().getEntityPermissions(user.getId(), ActionGroup.ATTACH_DISK_PROFILE, diskProfile.getId(), -- To view, visit http://gerrit.ovirt.org/37269 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ab3247d0f80e2f5123aace3fac58bee2a8a7b8d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
