Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-06 09:17:28 +02:00
Code Issues Projects Releases Wiki Activity

Avoid odd behavior where Sponge prevents User subjects from being GCed

Browse Source
This commit is contained in:
Luck 2016-10-09 21:34:05 +01:00
parent 1eb053447e
commit 069e535f1a
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sponge/src/main/java/me/lucko/luckperms/api/sponge/ContextData.java
View File

@ -36,7 +36,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
public class ContextData {
private final LuckPermsUserSubject parent;
@Getter
private final Map<String, String> context;
@ -47,7 +46,6 @@ public class ContextData {
private final PermissionCalculator calculator;
public ContextData(LuckPermsUserSubject parent, Map<String, String> context, LuckPermsService service) {
this.parent = parent;
this.context = context;
Set<Context> contexts = context.entrySet().stream().map(e -> new Context(e.getKey(), e.getValue())).collect(Collectors.toSet());

15
sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
View File

@ -50,10 +50,10 @@ public class LuckPermsSubject implements Subject {
}
@Getter
private final PermissionHolder holder;
private final LuckPermsSubjectData enduringData;
private final LuckPermsSubjectData transientData;
protected final LuckPermsService service;
private PermissionHolder holder;
private LuckPermsSubjectData enduringData;
private LuckPermsSubjectData transientData;
protected LuckPermsService service;
LuckPermsSubject(PermissionHolder holder, LuckPermsService service) {
this.holder = holder;
@ -62,6 +62,13 @@ public class LuckPermsSubject implements Subject {
this.service = service;
}
public void deprovision() {
holder = null;
enduringData = null;
transientData = null;
service = null;
}
void objectSave(PermissionHolder t) {
service.getPlugin().doAsync(() -> {
if (t instanceof User) {

13
sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsUserSubject.java
View File

@ -45,10 +45,10 @@ public class LuckPermsUserSubject extends LuckPermsSubject {
}
@Getter
private final User user;
private User user;
@Getter
private final Map<Map<String, String>, ContextData> contextData;
private Map<Map<String, String>, ContextData> contextData;
private LuckPermsUserSubject(User user, LuckPermsService service) {
super(user, service);
@ -57,6 +57,15 @@ public class LuckPermsUserSubject extends LuckPermsSubject {
contextData = new ConcurrentHashMap<>();
}
@Override
public void deprovision() {
/* For some reason, Sponge holds onto User instances in a cache, which in turn, prevents LuckPerms data from being GCed.
As well as unloading, we also remove all references to the User instances. */
super.deprovision();
user = null;
contextData = null;
}
@Override
public Tristate getPermissionValue(@NonNull Set<Context> contexts, @NonNull String permission) {
Map<String, String> context = contexts.stream().collect(Collectors.toMap(Context::getKey, Context::getValue));

4
sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
View File

@ -92,7 +92,9 @@ public class UserCollection implements SubjectCollection {
* @param uuid the internal uuid of the user
*/
public void unload(UUID uuid) {
users.remove(uuid);
if (users.containsKey(uuid)) {
users.remove(uuid).deprovision();
}
}
@Override