diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-28 10:10:36 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-28 10:10:36 -0800 |
commit | df3701872d6c97ff49943aea30761b47e60fa9fe (patch) | |
tree | 5bb75a7433cd34d35ce1e81392970052abec3f01 /activesupport/lib | |
parent | a0fd9fb01730af12d66a27b5665cc010bd3b90b4 (diff) | |
parent | f7b1906ed784940bda6f0c5173036de276867c1c (diff) | |
download | rails-df3701872d6c97ff49943aea30761b47e60fa9fe.tar.gz rails-df3701872d6c97ff49943aea30761b47e60fa9fe.tar.bz2 rails-df3701872d6c97ff49943aea30761b47e60fa9fe.zip |
Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/cache.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 7d032ca984..6ba0a600b1 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -578,7 +578,17 @@ module ActiveSupport # it is marshalled and eventually compressed. Both operations yield # strings. if @value - Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value) + # In rails 3.1 and earlier values in entries did not marshaled without + # options[:compress] and if it's Numeric. + # But after commit a263f377978fc07515b42808ebc1f7894fafaa3a + # all values in entries are marshalled. And after that code below expects + # that all values in entries will be marshaled (and will be strings). + # So here we need a check for old ones. + begin + Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value) + rescue + compressed? ? Zlib::Inflate.inflate(@value) : @value + end end end |