aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/dependencies.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-31 03:16:28 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-31 03:16:28 +0000
commit12ff554cd476bd2c653d9fd331bbcabb71363f3a (patch)
treecba0755d5ae3731380370af405e4f7e51490b27c /activesupport/lib/active_support/dependencies.rb
parent785e1fa599050513f8d0b235338c771f04dcf422 (diff)
downloadrails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.gz
rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.tar.bz2
rails-12ff554cd476bd2c653d9fd331bbcabb71363f3a.zip
Tighten rescue clauses. Closes #5985.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r--activesupport/lib/active_support/dependencies.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index ca418fe500..7a74884dc7 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -341,14 +341,14 @@ end
class Object #:nodoc:
def load(file, *extras)
super(file, *extras)
- rescue Object => exception
+ rescue Exception => exception # errors from loading file
exception.blame_file! file
raise
end
def require(file, *extras)
super(file, *extras)
- rescue Object => exception
+ rescue Exception => exception # errors from required file
exception.blame_file! file
raise
end