diff options
| author | Scott Barron <scott@elitists.net> | 2005-11-10 12:59:22 +0000 |
|---|---|---|
| committer | Scott Barron <scott@elitists.net> | 2005-11-10 12:59:22 +0000 |
| commit | 339fff7950bbec9936805627b5bad9ec51eb2c14 (patch) | |
| tree | 09dcc0ee9eb8a98de2dcae36a25ce683d93a79dc /actionpack | |
| parent | 7afaa6ed55234245c13554090d3512d252994403 (diff) | |
| download | rails-339fff7950bbec9936805627b5bad9ec51eb2c14.tar.gz rails-339fff7950bbec9936805627b5bad9ec51eb2c14.tar.bz2 rails-339fff7950bbec9936805627b5bad9ec51eb2c14.zip | |
This does not need to be thread local (thanks skaes).
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2970 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/components.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index 2d14d6c37f..aeb0272cd1 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -52,11 +52,11 @@ module ActionController #:nodoc: def component_response(options, reuse_response = true) begin ActionController::Flash::FlashHash.avoid_sweep = true - Thread.current[:p] = component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component) + p = component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component) ensure ActionController::Flash::FlashHash.avoid_sweep = false end - Thread.current[:p] + p end def component_class(options) |