diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-12 16:46:25 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-06-12 16:46:25 +0000 |
| commit | c5f00580d376a226956401e8802ab7f0ffced563 (patch) | |
| tree | 4f1b63026f66869819629fd75e9ae482d834f868 /railties | |
| parent | 979c22444d832e51b29c0404e3b990cab00606e9 (diff) | |
| download | rails-c5f00580d376a226956401e8802ab7f0ffced563.tar.gz rails-c5f00580d376a226956401e8802ab7f0ffced563.tar.bz2 rails-c5f00580d376a226956401e8802ab7f0ffced563.zip | |
Fix precedence error in failsafe rescue. Closes #8625.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index de6b554219..fd39b1991b 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -40,7 +40,7 @@ class Dispatcher end rescue Exception => exception # errors from CGI dispatch failsafe_response(cgi, output, '500 Internal Server Error', exception) do - controller ||= ApplicationController rescue ActionController::Base + controller ||= (ApplicationController rescue ActionController::Base) controller.process_with_exception(request, response, exception).out(output) end ensure |