diff options
| author | Andrew Kreiling <agkr@pobox.com> | 2013-03-03 07:50:59 -0600 |
|---|---|---|
| committer | Alex Tambellini <atambellini@gmail.com> | 2013-06-09 18:20:10 -0400 |
| commit | a548792aa0beef4330a3d47eb75dd2fe741013bc (patch) | |
| tree | 73c25e049f42333dbaff3a1a95c0153ccacbd11f /activesupport/lib/active_support | |
| parent | f5e133e830940731b74c4e12118eab90054d32ec (diff) | |
| download | rails-a548792aa0beef4330a3d47eb75dd2fe741013bc.tar.gz rails-a548792aa0beef4330a3d47eb75dd2fe741013bc.tar.bz2 rails-a548792aa0beef4330a3d47eb75dd2fe741013bc.zip | |
Don't blindly call blame_file! on exceptions in ActiveSupport::Dependencies::Loadable
It is possible under some environments to receive an Exception that is
not extended with Blamable (e.g. JRuby).
ActiveSupport::Dependencies::Loadable#load_dependency blindly call
blame_file! on the exception which throws it's own NoMethodError
exception and hides the original Exception.
This commit fixes #9521
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index fff4c776a9..d38e4b0732 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -213,7 +213,7 @@ module ActiveSupport #:nodoc: yield end rescue Exception => exception # errors from loading file - exception.blame_file! file + exception.blame_file! file if exception.respond_to? :blame_file! raise end |