Skip to content
Browse files

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...
1 parent 7ba2872 commit 2c62baf4bf221aa8aa67f4625fe7011d40c44e82 @NZKoz NZKoz committed Sep 4, 2008
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/core_ext/time.rb
View
2 activesupport/lib/active_support/core_ext/time.rb
@@ -15,7 +15,7 @@ class << self
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

0 comments on commit 2c62baf

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