From d7751036fa0af56b31a1d1350284fa86c0f93971 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 14 Apr 2009 16:18:24 -0500 Subject: Final blow to CGI --- actionpack/lib/action_controller/dispatch/dispatcher.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'actionpack/lib/action_controller/dispatch') diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index bb9d8bd063..091cc49412 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -66,8 +66,7 @@ module ActionController define_callbacks :prepare_dispatch, :before_dispatch, :after_dispatch def initialize - @app = @@middleware.build(lambda { |env| self._call(env) }) - freeze + @app = @@middleware.build(lambda { |env| self.dup._call(env) }) end def call(env) @@ -75,18 +74,8 @@ module ActionController end def _call(env) - begin - run_callbacks :before_dispatch - Routing::Routes.call(env) - rescue Exception => exception - if controller ||= (::ApplicationController rescue Base) - controller.call_with_exception(env, exception).to_a - else - raise exception - end - ensure - run_callbacks :after_dispatch, :enumerator => :reverse_each - end + @env = env + dispatch end def flush_logger -- cgit v1.2.3