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

Clean up Sweeper controller accessor when an Error is raised

1 files changed, 7 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}"