Ensure ActionView::Digest.cache is correctly cleaned up when

ActionView::Resolver.caching = false.
rails · Oct 14, 2013 · 2b3a349 · 2b3a349
1 parent 89969dd
commit 2b3a349
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb
@@ -36,12 +36,12 @@ def compute_and_store_digest(cache_key, name, format, finder, options) # called
         end
 
         # Store the actual digest if config.cache_template_loading is true
-        klass.new(name, format, finder, options).digest.tap do |digest|
+        digest = klass.new(name, format, finder, options).digest
-          @@cache[cache_key] = digest if ActionView::Resolver.caching?
+        @@cache[cache_key] = digest if ActionView::Resolver.caching?
-        end
+        digest
-      rescue Exception
+      ensure
-        @@cache.delete_pair(cache_key, false) if pre_stored # something went wrong, make sure not to corrupt the @@cache
+        # something went wrong or ActionView::Resolver.caching? is false, make sure not to corrupt the @@cache
-        raise
+        @@cache.delete_pair(cache_key, false) if pre_stored || !digest 
       end
     end