safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-696: Use Guava Sets to combine the user groups.

Browse Source
This commit is contained in:
Virtually Nick
2019-05-05 21:16:44 -04:00
parent e1fea889ca
commit 9158ca68e3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java
View File

@@ -19,8 +19,8 @@
package org.apache.guacamole.auth.jdbc.user;
import com.google.common.collect.Sets;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.guacamole.net.auth.AuthenticatedUser;
@@ -172,9 +172,8 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser {
@Override
public Set<String> getEffectiveUserGroups() {
Set<String> allGroups = new HashSet<>(user.getEffectiveUserGroups());
allGroups.addAll(super.getEffectiveUserGroups());
return Collections.unmodifiableSet(allGroups);
return Sets.union(user.getEffectiveUserGroups(),
super.getEffectiveUserGroups());
}
}