Skip to content

Commit

Permalink
SAK-23825 Correctly get the exsiting role when multiple sections used.
Browse files Browse the repository at this point in the history
The existing role and the new role where both set to the new value, this caused a lower role in a second section to incorrecly take precendence.

Patch from Juan José Meroño Sánchez.

git-svn-id: https://source.sakaiproject.org/svn/providers/trunk@310806 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
buckett committed Jul 16, 2014
1 parent 8b0dc0a commit eb01800
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ public Map<String, String> getUserRolesForGroup(String id) {
for(Iterator<Entry<String, String>> rrRoleIter = rrUserRoleMap.entrySet().iterator(); rrRoleIter.hasNext();) {
Entry<String, String> entry = rrRoleIter.next();
String userEid = entry.getKey();
String existingRole = entry.getValue();
String rrRole = rrUserRoleMap.get(userEid);
String existingRole = userRoleMap.get(userEid);
String rrRole = entry.getValue();

// The Role Resolver has found no role for this user
if(rrRole == null) {
Expand Down

0 comments on commit eb01800

Please sign in to comment.