aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 23:08:07 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-20 23:08:07 +0000
commit656fe3ccb609669fe76b48a07446618742e71970 (patch)
tree37fe5e7cf662b9de06a161770d69c55f9e4e1250 /actionpack
parentab3a813364c1c238728901849389bd2227ded8c2 (diff)
downloadrails-656fe3ccb609669fe76b48a07446618742e71970.tar.gz
rails-656fe3ccb609669fe76b48a07446618742e71970.tar.bz2
rails-656fe3ccb609669fe76b48a07446618742e71970.zip
All the memory-based stores should use a mutex #611 [inspire22]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@724 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/caching.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 98dd9c9df6..c1c78147e3 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -305,13 +305,13 @@ module ActionController #:nodoc:
class DRbStore < MemoryStore #:nodoc:
def initialize(address = 'druby://localhost:9192')
- @data = DRbObject.new(nil, address)
+ @data, @mutex = DRbObject.new(nil, address), Mutex.new
end
end
class MemCacheStore < MemoryStore #:nodoc:
def initialize(address = 'localhost')
- @data = MemCache.new(address)
+ @data, @mutex = MemCache.new(address), Mutex.new
end
end