Martin Peřina has uploaded a new change for review. Change subject: core: Fix NPE in DbUserCacheManager ......................................................................
core: Fix NPE in DbUserCacheManager Fix NPE in DbUserCacheManager causing inability to login as admin@internal if LDAP domain has been add prior to first execution of engine. Change-Id: I7703d446841bea47222a066fe0a2b51827f12430 Bug-Url: https://bugzilla.redhat.com/1063276 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/24277/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java index fa63b2b..5965087 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java @@ -214,13 +214,18 @@ StringBuilder groupIdsBuffer = new StringBuilder(); boolean first = true; for (DirectoryGroup directoryGroup : directoryUser.getGroups()) { - DbGroup dbGroup = groupsMap.get(directoryGroup.getId()); if (!first) { groupNamesBuffer.append(','); - groupIdsBuffer.append(dbGroup.getId()); + groupIdsBuffer.append(','); } - groupNamesBuffer.append(directoryGroup.getName()); - groupIdsBuffer.append(directoryGroup.getId()); + DbGroup dbGroup = groupsMap.get(directoryGroup.getId()); + if (dbGroup != null) { + groupNamesBuffer.append(dbGroup.getName()); + groupIdsBuffer.append(dbGroup.getExternalId()); + } else { + groupNamesBuffer.append(directoryGroup.getName()); + groupIdsBuffer.append(directoryGroup.getId()); + } first = false; } String groupNames = groupNamesBuffer.toString(); -- To view, visit http://gerrit.ovirt.org/24277 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7703d446841bea47222a066fe0a2b51827f12430 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
