You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/09 14:07:30 UTC
[2/6] groovy git commit: Refine EvictableMemoizeCache
Refine EvictableMemoizeCache
(cherry picked from commit 1aa79fd)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a98c3426
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a98c3426
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a98c3426
Branch: refs/heads/GROOVY_2_6_X
Commit: a98c3426d256fec3d00c0184da3913b5db4754bf
Parents: 316329d
Author: sunlan <su...@apache.org>
Authored: Sat Dec 9 20:35:16 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 9 22:06:42 2017 +0800
----------------------------------------------------------------------
.../groovy/runtime/memoize/EvictableMemoizeCache.java | 4 ++--
.../org/codehaus/groovy/runtime/memoize/SimpleCache.java | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a98c3426/src/main/org/codehaus/groovy/runtime/memoize/EvictableMemoizeCache.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/memoize/EvictableMemoizeCache.java b/src/main/org/codehaus/groovy/runtime/memoize/EvictableMemoizeCache.java
index 83b3498..a5dd318 100644
--- a/src/main/org/codehaus/groovy/runtime/memoize/EvictableMemoizeCache.java
+++ b/src/main/org/codehaus/groovy/runtime/memoize/EvictableMemoizeCache.java
@@ -29,9 +29,9 @@ public interface EvictableMemoizeCache<K, V> extends MemoizeCache<K, V> {
/**
* Remove the cached value by the key
* @param key
- * @return returns false if there was no matching key
+ * @return returns the removed value
*/
- boolean remove(K key);
+ V remove(K key);
/**
* Clear the cache
http://git-wip-us.apache.org/repos/asf/groovy/blob/a98c3426/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java b/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
index 50affef..4eb0453 100644
--- a/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
+++ b/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
@@ -94,25 +94,19 @@ public class SimpleCache<K, V> implements EvictableMemoizeCache<K, V> {
return value;
}
-
-
@Override
public Collection<V> values() {
return map.values();
}
@Override
- public boolean remove(K key) {
- V removedValue;
-
+ public V remove(K key) {
writeLock.lock();
try {
- removedValue = map.remove(key);
+ return map.remove(key);
} finally {
writeLock.unlock();
}
-
- return null != removedValue;
}
@Override