The-pack-family/APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset copiedRanks at the end of each iteration in User#getRanksScoped. This is a fix for an issue where the Iterator#remove call used here would fail if there was more than one other conflicting grants. We change this method to use a Set#remove to prevent the issues caused by trying to call Iterator#remove() multiple times and throwing an IllegalStateException.

Browse Source
This commit is contained in:
Colin McDonald 2016-07-16 14:39:50 -04:00
parent cf045e2a49
commit 07b503504a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/frozenorb/apiv3/model/User.java
View File

@ -611,17 +611,12 @@ public final class User {
return ImmutableList.of(Rank.findById("default"));
}
Iterator<Rank> iterator = grantedRanks.iterator();
Set<Rank> copiedRanks = ImmutableSet.copyOf(grantedRanks);
// This is to remove redundant ranks. Say they have mod, mod-plus, admin, and youtuber,
// we should remove mod and mod-plus as it'll be made redundant by the higher ranked admin.
while (iterator.hasNext()) {
Rank rank = iterator.next();
for (Rank grantedRank : ImmutableSet.copyOf(grantedRanks)) {
// Check all other ranks for inherited collision
for (Rank otherRank : copiedRanks) {
if (otherRank == rank) {
for (Rank otherRank : ImmutableSet.copyOf(grantedRanks)) {
if (grantedRank == otherRank) {
continue;
}
@ -629,8 +624,8 @@ public final class User {
// Iterate up the inheritance tree to detect rank redundancies.
while (parent.getInheritsFromId() != null) {
if (parent == rank) {
iterator.remove();
if (parent == grantedRank) {
grantedRanks.remove(grantedRank);
}
parent = Rank.findById(parent.getInheritsFromId());