diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 690e5ce1946df..732ab4b7df7b3 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -644,7 +644,7 @@ def convert_version_3_entry! @c = @compressed remove_instance_variable(:@compressed) end - if defined?(@expires_in) && defined?(@created_at) + if defined?(@expires_in) && defined?(@created_at) && @expires_in && @created_at @x = (@created_at + @expires_in).to_i remove_instance_variable(:@created_at) remove_instance_variable(:@expires_in)