Actually check the value of the ivar

2010-03-27 12:16:50 -07:00 · 2010-03-27 12:16:50 -07:00 · 4b9f167231
commit 4b9f167231
parent 4384a95b51
1 changed files with 2 additions and 4 deletions
--- a/activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb
+++ b/activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb
@ -9,11 +9,9 @@ def _load(marshaled_time)
        time = _original_load(marshaled_time)
        time.instance_eval do
          if defined?(@marshal_with_utc_coercion)
-            remove_instance_variable("@marshal_with_utc_coercion")
-            utc
-          else
-            self
+            val = remove_instance_variable("@marshal_with_utc_coercion")
          end
+          val ? utc : self
        end
      end
    end