aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-19 17:51:29 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-19 17:51:44 +0200
commit312f43324159fbcd8749cd331ed7d6500a714a83 (patch)
tree750659e6006e58f2941c09ffdd3011e904c63b26 /actionpack
parentd430db9fd407fd6aee25ca13538d8988dc7ee297 (diff)
downloadrails-312f43324159fbcd8749cd331ed7d6500a714a83.tar.gz
rails-312f43324159fbcd8749cd331ed7d6500a714a83.tar.bz2
rails-312f43324159fbcd8749cd331ed7d6500a714a83.zip
Clear DescendantsTracker on each request.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/callbacks.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index d07841218a..e4ae480bfb 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -8,7 +8,7 @@ module ActionDispatch
class Callbacks
include ActiveSupport::Callbacks
- define_callbacks :call, :terminator => "result == false", :rescuable => true
+ define_callbacks :call, :rescuable => true
define_callbacks :prepare, :scope => :name
# Add a preparation callback. Preparation callbacks are run before every
@@ -37,12 +37,12 @@ module ActionDispatch
def initialize(app, prepare_each_request = false)
@app, @prepare_each_request = app, prepare_each_request
- run_callbacks(:prepare)
+ _run_prepare_callbacks
end
def call(env)
- run_callbacks(:call) do
- run_callbacks(:prepare) if @prepare_each_request
+ _run_call_callbacks do
+ _run_prepare_callbacks if @prepare_each_request
@app.call(env)
end
end