aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/strategy/local_cache.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/cache/strategy/local_cache.rb')
-rw-r--r--activesupport/lib/active_support/cache/strategy/local_cache.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index fe5bc82c30..e1da2be2d4 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -48,6 +48,10 @@ module ActiveSupport
@data.clear
end
+ def fetch(*args, &block)
+ @data.fetch(*args, &block)
+ end
+
def read_entry(key, options)
@data[key]
end
@@ -99,12 +103,11 @@ module ActiveSupport
protected
def read_entry(key, options) # :nodoc:
if local_cache
- entry = local_cache.read_entry(key, options)
- unless entry
+ local_cache.fetch(key) do
entry = super
local_cache.write_entry(key, entry, options)
+ entry
end
- entry
else
super
end