Don't wrap the raise with ensure

2 files changed, 12 insertions, 10 deletions

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 3a944cf1ab..ebb8e5c1a6 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -160,16 +160,18 @@ module ActionView
     # virtual path set (true just for inline templates).
     def refresh(view)
       raise "A template needs to have a virtual path in order to be refreshed" unless @virtual_path
-      lookup  = view.lookup_context
-      pieces  = @virtual_path.split("/")
-      name    = pieces.pop
-      partial = !!name.sub!(/^_/, "")
-      previous_formats, lookup.formats = lookup.formats, @formats
-      lookup.disable_cache do
-        lookup.find_template(name, [ pieces.join('/') ], partial, @locals)
+      begin
+        lookup  = view.lookup_context
+        pieces  = @virtual_path.split("/")
+        name    = pieces.pop
+        partial = !!name.sub!(/^_/, "")
+        previous_formats, lookup.formats = lookup.formats, @formats
+        lookup.disable_cache do
+          lookup.find_template(name, [ pieces.join('/') ], partial, @locals)
+        end
+      ensure
+        lookup.formats = previous_formats
       end
-    ensure
-      lookup.formats = previous_formats
     end
 
     def inspect
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 836c5c7586..dd45a08b01 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -12,7 +12,7 @@ class TestERBTemplate < ActiveSupport::TestCase
     def find_template(*args)
     end
 
-    attr_writer :formats
+    attr_accessor :formats
   end
 
   class Context