Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raised

Clean up Sweeper controller accessor when an Error is raised

2 files changed, 18 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 39da15e26a..73291ce083 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -68,14 +68,14 @@ module ActionController #:nodoc:
         def after(controller)
           self.controller = controller
           callback(:after) if controller.perform_caching
-          # Clean up, so that the controller can be collected after this request
-          self.controller = nil
         end
 
         def around(controller)
           before(controller)
           yield
           after(controller)
+        ensure
+          clean_up
         end
 
         protected
@@ -90,6 +90,11 @@ module ActionController #:nodoc:
           end
 
         private
+          def clean_up
+            # Clean up, so that the controller can be collected after this request
+            self.controller = nil
+          end
+
           def callback(timing)
             controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
             action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index b9cb93f0f4..afc00a3c9d 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -505,6 +505,10 @@ class FilterTest < ActionController::TestCase
     def show
       render :text => 'hello world'
     end
+
+    def error
+      raise StandardError.new
+    end
   end
 
   class ImplicitActionsController < ActionController::Base
@@ -534,6 +538,13 @@ class FilterTest < ActionController::TestCase
     assert_equal 'hello world', response.body
   end
 
+  def test_sweeper_should_clean_up_if_exception_is_raised
+    assert_raise StandardError do
+      test_process(SweeperTestController, 'error')
+    end
+    assert_nil AppSweeper.instance.controller
+  end
+
   def test_before_method_of_sweeper_should_always_return_true
     sweeper = ActionController::Caching::Sweeper.send(:new)
     assert sweeper.before(TestController.new)