From ed3b5a3cf108f81ed41b9e267a1b5bb3204ae2a3 Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 17 May 2018 18:12:20 +0100 Subject: [PATCH] Lazily load contexts cache for Sponge subjects (#1005) --- .../sponge/service/proxy/api6/SubjectProxy.java | 16 +++++++++++----- .../sponge/service/proxy/api7/SubjectProxy.java | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java index 97cf89043..91ad02ba3 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java @@ -54,20 +54,26 @@ public final class SubjectProxy implements Subject, ProxiedSubject { private final LPPermissionService service; private final LPSubjectReference ref; - private final ContextsCache contextsCache; + private ContextsCache contextsCache = null; public SubjectProxy(LPPermissionService service, LPSubjectReference ref) { this.service = service; this.ref = ref; - - ContextManager contextManager = (ContextManager) service.getPlugin().getContextManager(); - this.contextsCache = contextManager.getCacheFor(this); } private CompletableFuture handle() { return this.ref.resolveLp(); } + // lazy init + private ContextsCache getContextsCache() { + if (this.contextsCache == null) { + ContextManager contextManager = (ContextManager) this.service.getPlugin().getContextManager(); + this.contextsCache = contextManager.getCacheFor(this); + } + return this.contextsCache; + } + @Nonnull @Override public LPSubjectReference asSubjectReference() { @@ -164,7 +170,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject { @Nonnull @Override public Set getActiveContexts() { - return CompatibilityUtil.convertContexts(this.contextsCache.getContextSet()); + return CompatibilityUtil.convertContexts(getContextsCache().getContextSet()); } @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java index 81fe9a973..c08c7f152 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java @@ -54,20 +54,26 @@ public final class SubjectProxy implements Subject, ProxiedSubject { private final LPPermissionService service; private final LPSubjectReference ref; - private final ContextsCache contextsCache; + private ContextsCache contextsCache; public SubjectProxy(LPPermissionService service, LPSubjectReference ref) { this.service = service; this.ref = ref; - - ContextManager contextManager = (ContextManager) service.getPlugin().getContextManager(); - this.contextsCache = contextManager.getCacheFor(this); } private CompletableFuture handle() { return this.ref.resolveLp(); } + // lazy init + private ContextsCache getContextsCache() { + if (this.contextsCache == null) { + ContextManager contextManager = (ContextManager) this.service.getPlugin().getContextManager(); + this.contextsCache = contextManager.getCacheFor(this); + } + return this.contextsCache; + } + @Nonnull @Override public LPSubjectReference asSubjectReference() { @@ -165,7 +171,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject { @Nonnull @Override public Set getActiveContexts() { - return CompatibilityUtil.convertContexts(this.contextsCache.getContextSet()); + return CompatibilityUtil.convertContexts(getContextsCache().getContextSet()); } @Override