Hello Martin Peřina,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/24290
to review the following change.
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 <[email protected]>
---
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/90/24290/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/24290
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7703d446841bea47222a066fe0a2b51827f12430
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: Martin Peřina <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
