diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-02 13:48:45 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-02 13:48:45 -0300 |
| commit | ed6be5962420e75a60ccc32c3fdf575f1c14ff9a (patch) | |
| tree | 00581ab84b65309f8860c1fcd8875374a657151d /activesupport/lib | |
| parent | 521318333eaa2654b9ad535c592281ae9efb9113 (diff) | |
| parent | 562b0b23684333be8766dc73c419f7b753933626 (diff) | |
| download | rails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.tar.gz rails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.tar.bz2 rails-ed6be5962420e75a60ccc32c3fdf575f1c14ff9a.zip | |
Merge pull request #19173 from robin850/rbx-build
Improve the Rubinius build
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/rescuable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb index 1a02acd5b1..67aac32742 100644 --- a/activesupport/lib/active_support/rescuable.rb +++ b/activesupport/lib/active_support/rescuable.rb @@ -100,7 +100,7 @@ module ActiveSupport # a string, otherwise a NameError will be raised by the interpreter # itself when rescue_from CONSTANT is executed. klass = self.class.const_get(klass_name) rescue nil - klass ||= klass_name.constantize rescue nil + klass ||= (klass_name.constantize rescue nil) klass === exception if klass end |