diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-16 19:41:16 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-16 19:41:16 -0300 |
| commit | c44f8d255b3839142dd04c17b62ad57054ba41d4 (patch) | |
| tree | 9c94a5e889c250fcf0ade2c661ee4fba462f97af /actionview/lib/action_view/digestor.rb | |
| parent | 4fdde75b17734b26cba99d83bf06e175c896df34 (diff) | |
| parent | 0cdce7f910708005acd99c80463e9efb3df942b0 (diff) | |
| download | rails-c44f8d255b3839142dd04c17b62ad57054ba41d4.tar.gz rails-c44f8d255b3839142dd04c17b62ad57054ba41d4.tar.bz2 rails-c44f8d255b3839142dd04c17b62ad57054ba41d4.zip | |
Merge pull request #12540 from wyaeld/bug/fix-recursive-digest
Ensure ActionView::Digestor.cache is correctly cleaned up
Diffstat (limited to 'actionview/lib/action_view/digestor.rb')
| -rw-r--r-- | actionview/lib/action_view/digestor.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index af158a630b..5570e2a8dc 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -35,13 +35,13 @@ module ActionView Digestor end + digest = klass.new(name, format, finder, options).digest # Store the actual digest if config.cache_template_loading is true - klass.new(name, format, finder, options).digest.tap do |digest| - @@cache[cache_key] = digest if ActionView::Resolver.caching? - end - rescue Exception - @@cache.delete_pair(cache_key, false) if pre_stored # something went wrong, make sure not to corrupt the @@cache - raise + @@cache[cache_key] = stored_digest = digest if ActionView::Resolver.caching? + digest + ensure + # something went wrong or ActionView::Resolver.caching? is false, make sure not to corrupt the @@cache + @@cache.delete_pair(cache_key, false) if pre_stored && !stored_digest end end |