root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Remove unnecessary authority comparison. 

Issue: gh-7035
This commit is contained in:
Karel Maxa 2019-07-11 15:37:34 +02:00
parent 0fea2fb256
commit 2d36062846
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
View File

@ -192,7 +192,7 @@ public class RoleHierarchyImpl implements RoleHierarchy {
} else { } else {
rolesReachableInOneStepSet = this.rolesReachableInOneStepMap.get(higherRole); rolesReachableInOneStepSet = this.rolesReachableInOneStepMap.get(higherRole);
} }
addReachableRoles(rolesReachableInOneStepSet, lowerRole); rolesReachableInOneStepSet.add(lowerRole);
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("buildRolesReachableInOneStepMap() - From role " + higherRole logger.debug("buildRolesReachableInOneStepMap() - From role " + higherRole
+ " one can reach role " + lowerRole + " in one step."); + " one can reach role " + lowerRole + " in one step.");
@ -227,7 +227,7 @@ public class RoleHierarchyImpl implements RoleHierarchy {
// take a role from the rolesToVisit set // take a role from the rolesToVisit set
GrantedAuthority aRole = rolesToVisitSet.iterator().next(); GrantedAuthority aRole = rolesToVisitSet.iterator().next();
rolesToVisitSet.remove(aRole); rolesToVisitSet.remove(aRole);
addReachableRoles(visitedRolesSet, aRole); visitedRolesSet.add(aRole);
if (this.rolesReachableInOneStepMap.containsKey(aRole)) { if (this.rolesReachableInOneStepMap.containsKey(aRole)) {
Set<GrantedAuthority> newReachableRoles = this.rolesReachableInOneStepMap Set<GrantedAuthority> newReachableRoles = this.rolesReachableInOneStepMap
.get(aRole); .get(aRole);