Preload to_datetime before freezing a TimeWithZone instance

(cherry picked from commit 6560448)
rails · Feb 22, 2017 · 01738e5 · 01738e5
1 parent d2cb7f5
commit 01738e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Cache `ActiveSupport::TimeWithZone#to_datetime` before freezing.
+
+    *Adam Rice*
+
+
 ## Rails 5.0.1 (December 21, 2016) ##
 
 *   No changes.

diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
@@ -428,7 +428,8 @@ def blank?
     end
 
     def freeze
-      period; utc; time # preload instance variables before freezing
+      # preload instance variables before freezing
+      period; utc; time; to_datetime
       super
     end
 

diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -503,6 +503,7 @@ def test_freeze_preloads_instance_variables
     assert_nothing_raised do
       @twz.period
       @twz.time
+      @twz.to_datetime
     end
   end