diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-09-04 15:08:46 +0200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-09-04 15:09:30 +0200 |
| commit | 2c62baf4bf221aa8aa67f4625fe7011d40c44e82 (patch) | |
| tree | c1807c6ad46749f1a01c2f9beaf7f8cf91bcbe6d /activesupport | |
| parent | 7ba28726150f5d4ee3b3cb676d6b73cc3b62e186 (diff) | |
| download | rails-2c62baf4bf221aa8aa67f4625fe7011d40c44e82.tar.gz rails-2c62baf4bf221aa8aa67f4625fe7011d40c44e82.tar.bz2 rails-2c62baf4bf221aa8aa67f4625fe7011d40c44e82.zip | |
Handle the case where there is no ivar set.
This happens on jruby due to a bug, but also on historically marshalled data.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb index 2006cf4946..78bbfc917c 100644 --- a/activesupport/lib/active_support/core_ext/time.rb +++ b/activesupport/lib/active_support/core_ext/time.rb @@ -15,7 +15,7 @@ class Time alias_method :_original_load, :_load def _load(marshaled_time) time = _original_load(marshaled_time) - utc = time.send(:remove_instance_variable, '@marshal_with_utc_coercion') + utc = time.instance_variable_get('@marshal_with_utc_coercion') utc ? time.utc : time end end |