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:34 UTC
[6/6] groovy git commit: Refine SimpleCache
Refine SimpleCache
(cherry picked from commit 00c1ee1)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ddb2b923
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ddb2b923
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ddb2b923
Branch: refs/heads/GROOVY_2_6_X
Commit: ddb2b9233b53b1ca42700e8cebe6e8e4e4dc2560
Parents: 30fdba0
Author: sunlan <su...@apache.org>
Authored: Sat Dec 9 21:56:21 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat Dec 9 22:07:07 2017 +0800
----------------------------------------------------------------------
.../org/codehaus/groovy/runtime/memoize/SimpleCache.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ddb2b923/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 1ee86d0..f2b3287 100644
--- a/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
+++ b/src/main/org/codehaus/groovy/runtime/memoize/SimpleCache.java
@@ -95,12 +95,8 @@ public class SimpleCache<K, V> implements EvictableCache<K, V> {
return value;
}
- if (null == valueProvider) {
- return null;
- }
-
- value = valueProvider.provide(key);
- if (shouldCache) {
+ value = null == valueProvider ? null : valueProvider.provide(key);
+ if (shouldCache && null != value) {
map.put(key, value);
}
} finally {