Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 93ec1704a -> f54331312
Trivial refactoring (cherry picked from commit 1dc12ea) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f5433131 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f5433131 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f5433131 Branch: refs/heads/GROOVY_2_6_X Commit: f5433131233be4ae80af668cfd76bd1f55d426b3 Parents: 93ec170 Author: sunlan <[email protected]> Authored: Sun Dec 10 21:43:04 2017 +0800 Committer: sunlan <[email protected]> Committed: Sun Dec 10 21:43:35 2017 +0800 ---------------------------------------------------------------------- .../codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java | 2 +- .../org/codehaus/groovy/macro/transform/MacroMethodsCache.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/f5433131/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index 1090125..95919c9 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -2162,7 +2162,7 @@ public abstract class StaticTypeCheckingSupport { * a method lookup. */ private static class ExtensionMethodCache { - private final CommonCache<ClassLoader, Map<String, List<MethodNode>>> cache = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<>()); + private final CommonCache<ClassLoader, Map<String, List<MethodNode>>> cache = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<ClassLoader, Map<String, List<MethodNode>>>()); public Map<String, List<MethodNode>> getExtensionMethods(ClassLoader loader) { return cache.getAndPut( http://git-wip-us.apache.org/repos/asf/groovy/blob/f5433131/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 754bedc..5a6af4a 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 @@ -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 CommonCache<ClassLoader, Map<String, List<MethodNode>>> CACHE = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<>()); + private static final CommonCache<ClassLoader, Map<String, List<MethodNode>>> CACHE = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<ClassLoader, Map<String, List<MethodNode>>>()); public static Map<String, List<MethodNode>> get(final ClassLoader classLoader) { return CACHE.getAndPut(classLoader, new EvictableCache.ValueProvider<ClassLoader, Map<String, List<MethodNode>>>() {
