diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-06-09 23:48:28 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-06-09 23:48:28 -0700 |
| commit | cbfcd9ddf1c964829307a8ce4b483c50252898a7 (patch) | |
| tree | 73c25e049f42333dbaff3a1a95c0153ccacbd11f /activesupport/lib/active_support/dependencies.rb | |
| parent | f5e133e830940731b74c4e12118eab90054d32ec (diff) | |
| parent | a548792aa0beef4330a3d47eb75dd2fe741013bc (diff) | |
| download | rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.tar.gz rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.tar.bz2 rails-cbfcd9ddf1c964829307a8ce4b483c50252898a7.zip | |
Merge pull request #10795 from atambo/master
Don't blindly call blame_file! on exceptions in ActiveSupport::Dependes::Loadable
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
| -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 |