Merge pull request #22197 from grosser/grosser/fetch

do not override fetch on local cache

1 files changed, 5 insertions, 9 deletions

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 4e2d3e9875..d521061004 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -48,10 +48,6 @@ module ActiveSupport
             @data.clear
           end
 
-          def fetch(*args, &block)
-            @data.fetch(*args, &block)
-          end
-
           def read_entry(key, options)
             @data[key]
           end
@@ -64,6 +60,10 @@ module ActiveSupport
           def delete_entry(key, options)
             !!@data.delete(key)
           end
+
+          def fetch_entry(key, options = nil) # :nodoc:
+            @data.fetch(key) { @data[key] = yield }
+          end
         end
 
         # Use a local cache for the duration of block.
@@ -103,11 +103,7 @@ module ActiveSupport
         protected
           def read_entry(key, options) # :nodoc:
             if cache = local_cache
-              cache.fetch(key) do
-                entry = super
-                cache.write_entry(key, entry, options)
-                entry
-              end
+              cache.fetch_entry(key) { super }
             else
               super
             end