diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-09 03:29:56 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-09 04:12:09 -0300 |
| commit | b05c95190737eb39047a756e37d811b340a47ba2 (patch) | |
| tree | dcff1b600676bf9b1103f5669ce9c904a28e6d71 /activesupport | |
| parent | e58b2769cf2c4df348d4ac31a8c5497cbd545564 (diff) | |
| download | rails-b05c95190737eb39047a756e37d811b340a47ba2.tar.gz rails-b05c95190737eb39047a756e37d811b340a47ba2.tar.bz2 rails-b05c95190737eb39047a756e37d811b340a47ba2.zip | |
Temporary fix to get our LoadError monkey-patch working with newer JRuby. We should probably remove MissingSourceFile and just monkey-patch LoadError instead of overriding LoadError.new.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/load_error.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb index f36a21818f..cc6287b100 100644 --- a/activesupport/lib/active_support/core_ext/load_error.rb +++ b/activesupport/lib/active_support/core_ext/load_error.rb @@ -20,7 +20,8 @@ class MissingSourceFile < LoadError #:nodoc: REGEXPS = [ [/^no such file to load -- (.+)$/i, 1], [/^Missing \w+ (file\s*)?([^\s]+.rb)$/i, 2], - [/^Missing API definition file in (.+)$/i, 1] + [/^Missing API definition file in (.+)$/i, 1], + [/win32/, 0] ] unless defined?(REGEXPS) end |