0
@@ -463,7 +463,7 @@ module ActionView
0
       end
0
 
0
       private
0
-        COMPUTED_PUBLIC_PATHS = ActiveSupport::Cache::MemoryStore.new.silence!.threadsafe!
0
+        COMPUTED_PUBLIC_PATHS = ActiveSupport::Cache::MemoryStore.new.silence!
0
 
0
         # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
0
         # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL

0
@@ -39,10 +39,6 @@ module ActiveSupport
0
     class Store
0
       cattr_accessor :logger
0
 
0
-      def threadsafe!
0
-        extend ThreadSafety
0
-      end
0
-
0
       def silence!
0
         @silence = true
0
         self
0
@@ -115,20 +111,6 @@ module ActiveSupport
0
           logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !@silence && !@logger_off
0
         end
0
     end
0
-
0
-    module ThreadSafety #:nodoc:
0
-      def self.extended(object) #:nodoc:
0
-        object.instance_variable_set(:@mutex, Mutex.new)
0
-      end
0
-
0
-      %w(read write delete delete_matched exist? increment decrement).each do |method|
0
-        module_eval <<-EOS, __FILE__, __LINE__
0
-          def #{method}(*args)
0
-            @mutex.synchronize { super }
0
-          end
0
-        EOS
0
-      end
0
-    end
0
   end
0
 end
0
 

0
@@ -3,36 +3,67 @@ module ActiveSupport
0
     class MemoryStore < Store
0
       def initialize
0
         @data = {}
0
+        @mutex = Mutex.new
0
+      end
0
+
0
+      def fetch(key, options = {})
0
+        @mutex.synchronize do
0
+          super
0
+        end
0
       end
0
 
0
       def read(name, options = nil)
0
-        super
0
-        @data[name]
0
+        @mutex.synchronize do
0
+          super
0
+          @data[name]
0
+        end
0
       end
0
 
0
       def write(name, value, options = nil)
0
-        super
0
-        @data[name] = value
0
+        @mutex.synchronize do
0
+          super
0
+          @data[name] = value
0
+        end
0
       end
0
 
0
       def delete(name, options = nil)
0
-        super
0
-        @data.delete(name)
0
+        @mutex.synchronize do
0
+          super
0
+          @data.delete(name)
0
+        end
0
       end
0
 
0
       def delete_matched(matcher, options = nil)
0
-        super
0
-        @data.delete_if { |k,v| k =~ matcher }
0
+        @mutex.synchronize do
0
+          super
0
+          @data.delete_if { |k,v| k =~ matcher }
0
+        end
0
       end
0
 
0
       def exist?(name,options = nil)
0
-        super
0
-        @data.has_key?(name)
0
+        @mutex.synchronize do
0
+          super
0
+          @data.has_key?(name)
0
+        end
0
+      end
0
+
0
+      def increment(key, amount = 1)
0
+        @mutex.synchronize do
0
+          super
0
+        end
0
+      end
0
+
0
+      def decrement(key, amount = 1)
0
+        @mutex.synchronize do
0
+          super
0
+        end
0
       end
0
 
0
       def clear
0
-        @data.clear
0
+        @mutex.synchronize do
0
+          @data.clear
0
+        end
0
       end
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -70,70 +70,3 @@ uses_mocha 'high-level cache store tests' do
0
     end
0
   end
0
 end
0
-
0
-class ThreadSafetyCacheStoreTest < Test::Unit::TestCase
0
-  def setup
0
-    @cache = ActiveSupport::Cache.lookup_store(:memory_store).threadsafe!
0
-    @cache.write('foo', 'bar')
0
-
0
-    # No way to have mocha proxy to the original method
0
-    @mutex = @cache.instance_variable_get(:@mutex)
0
-    @mutex.instance_eval %(
0
-      def calls; @calls; end
0
-      def synchronize
0
-        @calls ||= 0
0
-        @calls += 1
0
-        yield
0
-      end
0
-    )
0
-  end
0
-
0
-  def test_read_is_synchronized
0
-    assert_equal 'bar', @cache.read('foo')
0
-    assert_equal 1, @mutex.calls
0
-  end
0
-
0
-  def test_write_is_synchronized
0
-    @cache.write('foo', 'baz')
0
-    assert_equal 'baz', @cache.read('foo')
0
-    assert_equal 2, @mutex.calls
0
-  end
0
-
0
-  def test_delete_is_synchronized
0
-    assert_equal 'bar', @cache.read('foo')
0
-    @cache.delete('foo')
0
-    assert_equal nil, @cache.read('foo')
0
-    assert_equal 3, @mutex.calls
0
-  end
0
-
0
-  def test_delete_matched_is_synchronized
0
-    assert_equal 'bar', @cache.read('foo')
0
-    @cache.delete_matched(/foo/)
0
-    assert_equal nil, @cache.read('foo')
0
-    assert_equal 3, @mutex.calls
0
-  end
0
-
0
-  def test_fetch_is_synchronized
0
-    assert_equal 'bar', @cache.fetch('foo') { 'baz' }
0
-    assert_equal 'fu', @cache.fetch('bar') { 'fu' }
0
-    assert_equal 3, @mutex.calls
0
-  end
0
-
0
-  def test_exist_is_synchronized
0
-    assert @cache.exist?('foo')
0
-    assert !@cache.exist?('bar')
0
-    assert_equal 2, @mutex.calls
0
-  end
0
-
0
-  def test_increment_is_synchronized
0
-    @cache.write('foo_count', 1)
0
-    assert_equal 2, @cache.increment('foo_count')
0
-    assert_equal 4, @mutex.calls
0
-  end
0
-
0
-  def test_decrement_is_synchronized
0
-    @cache.write('foo_count', 1)
0
-    assert_equal 0, @cache.decrement('foo_count')
0
-    assert_equal 4, @mutex.calls
0
-  end
0
-end

0
@@ -776,7 +776,6 @@ Run `rake gems:install` to install the missing gems.
0
       self.dependency_loading = false
0
       self.active_record.allow_concurrency = true
0
       self.action_controller.allow_concurrency = true
0
-      self.to_prepare { Rails.cache.threadsafe! }
0
       self
0
     end
0