aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 17:20:10 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 17:20:10 +0000
commitd8739bd8cb17e9ee4d87fcd4ca6bd6122e90a191 (patch)
treef8825bb6c793553df49893ee4b3b7d8c43dcc7c8 /railties/lib
parente4f07888ceca3c2ac11818a45cc3374537737e8e (diff)
downloadrails-d8739bd8cb17e9ee4d87fcd4ca6bd6122e90a191.tar.gz
rails-d8739bd8cb17e9ee4d87fcd4ca6bd6122e90a191.tar.bz2
rails-d8739bd8cb17e9ee4d87fcd4ca6bd6122e90a191.zip
Help against errors in ApplicationController
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 33f1e8d1cd..275c062ffe 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -27,8 +27,8 @@ class Dispatcher
class << self
def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
begin
+ request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
prepare_application
- request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
ActionController::Routing::Routes.recognize!(request).process(request, response).out
rescue Object => exception
ActionController::Base.process_with_exception(request, response, exception).out
@@ -54,4 +54,4 @@ class Dispatcher
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
end
end
-end \ No newline at end of file
+end