Skip to content
This repository
Browse code

Handle the case where there is no ivar set.

This happens on jruby due to a bug, but also on historically marshalled data.
  • Loading branch information...
commit cf51b173b6a2f7ad91beac4fe8cf4285b8ab51aa 1 parent 011cbbc
Michael Koziarski NZKoz authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  activesupport/lib/active_support/core_ext/time.rb
2  activesupport/lib/active_support/core_ext/time.rb
@@ -15,7 +15,7 @@ class << self
15 15 alias_method :_original_load, :_load
16 16 def _load(marshaled_time)
17 17 time = _original_load(marshaled_time)
18   - utc = time.send(:remove_instance_variable, '@marshal_with_utc_coercion')
  18 + utc = time.instance_variable_get('@marshal_with_utc_coercion')
19 19 utc ? time.utc : time
20 20 end
21 21 end

0 comments on commit cf51b17

Please sign in to comment.
Something went wrong with that request. Please try again.