aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb8
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