worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup usages of loadUser/loadGroup/loadTrack - eliminate possibility for unloading race condition (#706)

Browse Source
This commit is contained in:
Luck
2018-01-22 17:34:15 +00:00
Unverified
parent 40294b10f5
commit 1f70ad978f
31 changed files with 63 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java
+2 -4
View File
@@ -106,8 +106,7 @@ public class MigrationPermissionManager extends SubCommand<Object> {
String pmName = MigrationUtils.standardizeName(pmGroup.getIdentifier());
// Make a LuckPerms group for the one being migrated
plugin.getStorage().createAndLoadGroup(pmName, CreationCause.INTERNAL).join();
Group group = plugin.getGroupManager().getIfLoaded(pmName);
Group group = plugin.getStorage().createAndLoadGroup(pmName, CreationCause.INTERNAL).join();
migrateSubject(pmGroup, group, 100);
plugin.getStorage().saveGroup(group);
@@ -126,8 +125,7 @@ public class MigrationPermissionManager extends SubCommand<Object> {
}
// Make a LuckPerms user for the one being migrated
plugin.getStorage().loadUser(uuid, "null").join();
User user = plugin.getUserManager().getIfLoaded(uuid);
User user = plugin.getStorage().loadUser(uuid, "null").join();
if (user.getEnduringNodes().size() <= 1) {
user.clearNodes(false);
}
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java
+3 -6
View File
@@ -131,8 +131,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
// Make a LuckPerms group for the one being migrated
plugin.getStorage().createAndLoadGroup(pexName, CreationCause.INTERNAL).join();
Group group = plugin.getGroupManager().getIfLoaded(pexName);
Group group = plugin.getStorage().createAndLoadGroup(pexName, CreationCause.INTERNAL).join();
migrateSubject(pexGroup, group, weight);
plugin.getStorage().saveGroup(group);
@@ -153,8 +152,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
// Migrate tracks
log.log("Starting track migration.");
SafeIterator.iterate(tracks.entrySet(), e -> {
plugin.getStorage().createAndLoadTrack(e.getKey(), CreationCause.INTERNAL).join();
Track track = plugin.getTrackManager().getIfLoaded(e.getKey());
Track track = plugin.getStorage().createAndLoadTrack(e.getKey(), CreationCause.INTERNAL).join();
for (String groupName : e.getValue().values()) {
Group group = plugin.getGroupManager().getIfLoaded(groupName);
if (group != null) {
@@ -179,8 +177,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
// Make a LuckPerms user for the one being migrated
plugin.getStorage().loadUser(uuid, null).join();
User user = plugin.getUserManager().getIfLoaded(uuid);
User user = plugin.getStorage().loadUser(uuid, null).join();
if (user.getEnduringNodes().size() <= 1) {
user.clearNodes(false);
}