You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/03/31 06:36:49 UTC
groovy git commit: some changes that Intellij didn't sync
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X a36266cb5 -> 1c880224d
some changes that Intellij didn't sync
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/1c880224
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/1c880224
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/1c880224
Branch: refs/heads/GROOVY_2_6_X
Commit: 1c880224d451262f85fb5eea1ba1e7a885ad0a54
Parents: a36266c
Author: Paul King <pa...@asert.com.au>
Authored: Sat Mar 31 16:36:33 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sat Mar 31 16:36:33 2018 +1000
----------------------------------------------------------------------
src/main/groovy/groovy/lang/GroovyClassLoader.java | 10 +---------
.../org/codehaus/groovy/runtime/memoize/CommonCache.java | 1 +
.../groovy/runtime/memoize/ConcurrentCommonCache.java | 1 +
.../groovy/runtime/memoize/UnlimitedConcurrentCache.java | 1 +
4 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/1c880224/src/main/groovy/groovy/lang/GroovyClassLoader.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/GroovyClassLoader.java b/src/main/groovy/groovy/lang/GroovyClassLoader.java
index 4f067a0..af90895 100644
--- a/src/main/groovy/groovy/lang/GroovyClassLoader.java
+++ b/src/main/groovy/groovy/lang/GroovyClassLoader.java
@@ -89,21 +89,13 @@ public class GroovyClassLoader extends URLClassLoader {
/**
* this cache contains the loaded classes or PARSING, if the class is currently parsed
*/
-<<<<<<< HEAD
protected final EvictableCache<String, Class> classCache = new ConcurrentCommonCache<String, Class>();
-=======
- protected final Map<String, Class> classCache = new UnlimitedConcurrentCache<String, Class>();
->>>>>>> 38c7a74920... GROOVY-8525: Binary compatibility issue for GroovyClassLoader between 2.4 vs later branches (closes #679)
/**
* This cache contains mappings of file name to class. It is used
* to bypass compilation.
*/
-<<<<<<< HEAD
- protected final EvictableCache<String, Class> sourceCache = new ConcurrentCommonCache<String, Class>();
-=======
- protected final Map<String, Class> sourceCache = new StampedCommonCache<String, Class>();
->>>>>>> 38c7a74920... GROOVY-8525: Binary compatibility issue for GroovyClassLoader between 2.4 vs later branches (closes #679)
+ protected final Map<String, Class> sourceCache = new ConcurrentCommonCache<String, Class>();
private final CompilerConfiguration config;
private String sourceEncoding;
http://git-wip-us.apache.org/repos/asf/groovy/blob/1c880224/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
index 2d8f2e7..7a7bc9c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java
@@ -221,6 +221,7 @@ public class CommonCache<K, V> implements EvictableCache<K, V>, ValueConvertable
* Clear the cache
* @see #clearAll()
*/
+ @Override
public void clear() {
clearAll();
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/1c880224/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
index 1bafc52..ea5ec23 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java
@@ -277,6 +277,7 @@ public class ConcurrentCommonCache<K, V> implements EvictableCache<K, V>, ValueC
* Clear the cache
* @see #clearAll()
*/
+ @Override
public void clear() {
clearAll();
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/1c880224/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
index e507e7d..04bce56 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
@@ -106,6 +106,7 @@ public final class UnlimitedConcurrentCache<K, V> implements EvictableCache<K, V
* Clear the cache
* @see #clearAll()
*/
+ @Override
public void clear() {
clearAll();
}