Repository: groovy Updated Branches: refs/heads/master c6fbcb6f3 -> e86ef4234
Fix the cache class name: CommonCache Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e86ef423 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e86ef423 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e86ef423 Branch: refs/heads/master Commit: e86ef4234cd454646ab9c999527c39e4b8f80a99 Parents: c6fbcb6 Author: sunlan <[email protected]> Authored: Sun Dec 10 21:05:27 2017 +0800 Committer: sunlan <[email protected]> Committed: Sun Dec 10 21:05:27 2017 +0800 ---------------------------------------------------------------------- .../org/codehaus/groovy/macro/transform/MacroMethodsCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/e86ef423/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java index 4a7266d..89dd3a7 100644 --- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java +++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java @@ -26,8 +26,8 @@ import org.codehaus.groovy.macro.runtime.Macro; import org.codehaus.groovy.runtime.m12n.ExtensionModule; import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner; import org.codehaus.groovy.runtime.m12n.MetaInfExtensionModule; +import org.codehaus.groovy.runtime.memoize.CommonCache; import org.codehaus.groovy.runtime.memoize.EvictableCache; -import org.codehaus.groovy.runtime.memoize.SimpleCache; import org.codehaus.groovy.transform.stc.ExtensionMethodNode; import java.util.ArrayList; @@ -44,7 +44,7 @@ import java.util.WeakHashMap; */ class MacroMethodsCache { private static final ClassNode MACRO_ANNOTATION_CLASS_NODE = ClassHelper.make(Macro.class); - private static final SimpleCache<ClassLoader, Map<String, List<MethodNode>>> CACHE = new SimpleCache<>(new WeakHashMap<>()); + private static final CommonCache<ClassLoader, Map<String, List<MethodNode>>> CACHE = new CommonCache<>(new WeakHashMap<>()); public static Map<String, List<MethodNode>> get(final ClassLoader classLoader) { return CACHE.getAndPut(classLoader, new EvictableCache.ValueProvider<ClassLoader, Map<String, List<MethodNode>>>() {
