diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-10 13:46:25 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-10 13:46:25 -0500 |
| commit | b21f24d9807bd161af947cf0f0cc440c9adffb73 (patch) | |
| tree | 5fad53e909e746b194794b437f6ec26a4e34ad13 /activesupport | |
| parent | bf24ba98b37613742aa292000cdcb29f866918a8 (diff) | |
| download | rails-b21f24d9807bd161af947cf0f0cc440c9adffb73.tar.gz rails-b21f24d9807bd161af947cf0f0cc440c9adffb73.tar.bz2 rails-b21f24d9807bd161af947cf0f0cc440c9adffb73.zip | |
Ensure expires_in and created_at timestamps aren't nil when attempting to upgrade cache
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 690e5ce194..732ab4b7df 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -644,7 +644,7 @@ module ActiveSupport @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) |