diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-02-04 05:00:21 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-02-04 05:00:21 +0000 |
| commit | c77729fd23ccf169cafd1d72eb469fe1e4e42ea0 (patch) | |
| tree | f9c481c88e85432bcd85cbbbcbabc882f0d1b561 /actionpack | |
| parent | 1aaeb2113b64c9e5a26d7e4a24e868899b89f614 (diff) | |
| download | rails-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')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8a6892a3ed..7c00e8d8dd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Set sweeper's @controller to nil after a request so that the controller may be collected between requests. + * Subclasses of ActionController::Caching::Sweeper should be Reloadable. [Rick Olson] * Document the :xhr option for verifications. #3666 [leeo] 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 |