diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-01 17:26:46 -0500 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-01 17:26:46 -0500 |
commit | 12288a034120e8b1f90fcd4ae5881a858fd1425e (patch) | |
tree | cea73e54bc6266b8d949ee421c68336d1e50da49 /activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb | |
parent | 926f4648f0628009336c44f4d31019819434e39c (diff) | |
parent | f48e89931f3dfe0571f62f926c01cb7783814347 (diff) | |
download | rails-12288a034120e8b1f90fcd4ae5881a858fd1425e.tar.gz rails-12288a034120e8b1f90fcd4ae5881a858fd1425e.tar.bz2 rails-12288a034120e8b1f90fcd4ae5881a858fd1425e.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb')
-rw-r--r-- | activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb index 375cfb1430..dda7f2c30e 100644 --- a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb +++ b/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb @@ -278,12 +278,12 @@ class MemCache results = {} - server_keys.each do |server, keys| - keys = keys.join ' ' + server_keys.each do |server, keys_for_server| + keys_for_server = keys_for_server.join ' ' values = if @multithread then - threadsafe_cache_get_multi server, keys + threadsafe_cache_get_multi server, keys_for_server else - cache_get_multi server, keys + cache_get_multi server, keys_for_server end values.each do |key, value| results[cache_keys[key]] = Marshal.load value |