Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-06 19:09:31 +01:00
Code Issues Projects Releases Wiki Activity

Maybe fix issue with corrupted permission migration

Browse Source
This commit is contained in:
Luck 2016-11-15 20:18:32 +00:00
parent e296b1df60
commit db9d84ed76
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/me/lucko/luckperms/common/core/NodeFactory.java
View File

@ -26,11 +26,13 @@ import com.google.common.base.Splitter;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.UncheckedExecutionException;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.MetaUtils; import me.lucko.luckperms.api.MetaUtils;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException;
/** /**
* Utility class to make Node(Builder) instances from serialised strings or existing Nodes * Utility class to make Node(Builder) instances from serialised strings or existing Nodes
@ -40,7 +42,7 @@ public class NodeFactory {
private static final LoadingCache<String, Node> CACHE = CacheBuilder.newBuilder() private static final LoadingCache<String, Node> CACHE = CacheBuilder.newBuilder()
.build(new CacheLoader<String, Node>() { .build(new CacheLoader<String, Node>() {
@Override @Override
public Node load(String s) { public Node load(String s) throws Exception {
return builderFromSerialisedNode(s, true).build(); return builderFromSerialisedNode(s, true).build();
} }
}); });
@ -48,13 +50,17 @@ public class NodeFactory {
private static final LoadingCache<String, Node> CACHE_NEGATED = CacheBuilder.newBuilder() private static final LoadingCache<String, Node> CACHE_NEGATED = CacheBuilder.newBuilder()
.build(new CacheLoader<String, Node>() { .build(new CacheLoader<String, Node>() {
@Override @Override
public Node load(String s) { public Node load(String s) throws Exception {
return builderFromSerialisedNode(s, false).build(); return builderFromSerialisedNode(s, false).build();
} }
}); });
public static Node fromSerialisedNode(String s, Boolean b) { public static Node fromSerialisedNode(String s, Boolean b) {
return b ? CACHE.getUnchecked(s) : CACHE_NEGATED.getUnchecked(s); try {
return b ? CACHE.get(s) : CACHE_NEGATED.get(s);
} catch (UncheckedExecutionException | ExecutionException e) {
throw new IllegalArgumentException(e);
}
} }
public static Node.Builder newBuilder(String s) { public static Node.Builder newBuilder(String s) {