aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-02-04 05:00:21 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-02-04 05:00:21 +0000
commitc77729fd23ccf169cafd1d72eb469fe1e4e42ea0 (patch)
treef9c481c88e85432bcd85cbbbcbabc882f0d1b561 /actionpack/lib/action_controller/caching.rb
parent1aaeb2113b64c9e5a26d7e4a24e868899b89f614 (diff)
downloadrails-c77729fd23ccf169cafd1d72eb469fe1e4e42ea0.tar.gz
rails-c77729fd23ccf169cafd1d72eb469fe1e4e42ea0.tar.bz2
rails-c77729fd23ccf169cafd1d72eb469fe1e4e42ea0.zip
Set sweeper's @controller to nil after a request so that the controller may be collected between requests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3529 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 5e6fe3948b..4c1c6e6679 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -532,6 +532,8 @@ module ActionController #:nodoc:
def after(controller)
callback(:after)
+ # Clean up, so that the controller can be collected after this request
+ self.controller = nil
end
private