diff options
author | Michael S. Klishin <michael@novemberain.com> | 2008-12-29 00:50:06 +0300 |
---|---|---|
committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-29 00:50:18 +0300 |
commit | 069534af4f0440215af1f12f7f6f1c9e14a2e8bd (patch) | |
tree | 4b92bcf839f994288ef794120f85ce0500607b42 /actionpack/lib/action_controller/dispatcher.rb | |
parent | 19208e7422e191098bdbe3d12b75296777e2c75d (diff) | |
parent | c20c72e3d9321f8c00587aab479d962e80b02c35 (diff) | |
download | rails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.tar.gz rails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.tar.bz2 rails-069534af4f0440215af1f12f7f6f1c9e14a2e8bd.zip |
Sync with rails/rails/master
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
-rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 4dc76e1b49..c4e7357b81 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -60,11 +60,10 @@ module ActionController def dispatch begin run_callbacks :before_dispatch - controller = Routing::Routes.recognize(@request) - controller.process(@request, @response).to_a + Routing::Routes.call(@env) rescue Exception => exception if controller ||= (::ApplicationController rescue Base) - controller.process_with_exception(@request, @response, exception).to_a + controller.call_with_exception(@env, exception).to_a else raise exception end @@ -83,8 +82,7 @@ module ActionController end def _call(env) - @request = Request.new(env) - @response = Response.new + @env = env dispatch end @@ -110,8 +108,7 @@ module ActionController def checkin_connections # Don't return connection (and peform implicit rollback) if this request is a part of integration test - # TODO: This callback should have direct access to env - return if @request.key?("rack.test") + return if @env.key?("rack.test") ActiveRecord::Base.clear_active_connections! end end |