aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/rescue.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-11-30 17:11:40 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-11-30 17:11:40 +0000
commit38e5fe97be08109fb8a416238ff8e3aaacbfc703 (patch)
treee7d28370bd8329d48822ed931d81d6ca6aabb8cd /actionpack/lib/action_controller/rescue.rb
parent2fc559a4ca5266b7e72b746f60e4ee6078a27f25 (diff)
downloadrails-38e5fe97be08109fb8a416238ff8e3aaacbfc703.tar.gz
rails-38e5fe97be08109fb8a416238ff8e3aaacbfc703.tar.bz2
rails-38e5fe97be08109fb8a416238ff8e3aaacbfc703.zip
Pass on the original exception
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@30 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
-rw-r--r--actionpack/lib/action_controller/rescue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index c0933b2666..e624888b64 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -66,7 +66,7 @@ module ActionController #:nodoc:
def perform_action_with_rescue #:nodoc:
begin
perform_action_without_rescue
- rescue Exception => exception
+ rescue => exception
rescue_action(exception)
end
end