diff options
| author | Matt Williams <matt@makeable.co.uk> | 2012-01-17 13:54:09 +0100 |
|---|---|---|
| committer | Matt Williams <matt@makeable.co.uk> | 2012-01-17 13:54:09 +0100 |
| commit | 06ea1bad551badbdfb02ca7e23cb727f490a0e72 (patch) | |
| tree | 6f24d93ff40049e2bd4081653dcc84d34afd0e58 /activesupport | |
| parent | 4280b20cde6d0ec4694f25288832d098c83cceba (diff) | |
| download | rails-06ea1bad551badbdfb02ca7e23cb727f490a0e72.tar.gz rails-06ea1bad551badbdfb02ca7e23cb727f490a0e72.tar.bz2 rails-06ea1bad551badbdfb02ca7e23cb727f490a0e72.zip | |
race_condition_ttl should be an integer
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 7d032ca984..9b668c2969 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -280,7 +280,7 @@ module ActiveSupport end end if entry && entry.expired? - race_ttl = options[:race_condition_ttl].to_f + race_ttl = options[:race_condition_ttl].to_i if race_ttl and Time.now.to_f - entry.expires_at <= race_ttl entry.expires_at = Time.now + race_ttl write_entry(key, entry, :expires_in => race_ttl * 2) |