Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: NPE when adding permission to a datacenter ......................................................................
aaa: NPE when adding permission to a datacenter Change-Id: I379ffbac3e8323cf575d9d14c860dd03a6b6e686 Topic: AAA Bug-Url: https://bugzilla.redhat.com/1121406 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/30527/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java index f87df96..2e99adb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java @@ -10,7 +10,6 @@ import javax.ws.rs.core.Response; -import org.ovirt.engine.api.common.security.auth.Principal; import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Permission; @@ -207,7 +206,7 @@ User user = permission.getUser(); DbUser dbUser = UserMapper.map(user, null); if (dbUser.getDomain() == null) { - dbUser.setDomain(getCurrent().get(Principal.class).getDomain()); + dbUser.setDomain(getCurrent().get(DbUser.class).getDomain()); } return dbUser; } @@ -215,7 +214,7 @@ Group group = permission.getGroup(); DbGroup dbGroup = GroupMapper.map(group, null); if (dbGroup.getDomain() == null) { - dbGroup.setDomain(getCurrent().get(Principal.class).getDomain()); + dbGroup.setDomain(getCurrent().get(DbUser.class).getDomain()); } return dbGroup; } -- To view, visit http://gerrit.ovirt.org/30527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I379ffbac3e8323cf575d9d14c860dd03a6b6e686 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
