0
@@ -1,14 +1,12 @@
0
+require 'set'
0
+
0
 module ActiveRecord
0
   module ConnectionAdapters
0
     class ConnectionPool
0
-      # Check for activity after at least +verification_timeout+ seconds.
0
-      # Defaults to 0 (always check.)
0
-      attr_accessor :verification_timeout
0
+      delegate :verification_timeout, :to => "::ActiveRecord::Base"
0
       attr_reader :active_connections, :spec
0
 
0
       def initialize(spec)
0
-        @verification_timeout = 0
0
-
0
         # The thread id -> adapter cache.
0
         @active_connections = {}
0
 
0
@@ -44,7 +42,7 @@ module ActiveRecord
0
         end
0
       end
0
 
0
-      # Clears the cache which maps classes 
0
+      # Clears the cache which maps classes
0
       def clear_reloadable_connections!
0
         @active_connections.each do |name, conn|
0
           if conn.requires_reloading?
0
@@ -60,7 +58,7 @@ module ActiveRecord
0
           conn.disconnect!
0
         end
0
         active_connections.each_value do |connection|
0
-          connection.verify!(@verification_timeout)
0
+          connection.verify!(verification_timeout)
0
         end
0
       end
0
 
0
@@ -70,7 +68,7 @@ module ActiveRecord
0
         name = active_connection_name
0
         if conn = active_connections[name]
0
           # Verify the connection.
0
-          conn.verify!(@verification_timeout)
0
+          conn.verify!(verification_timeout)
0
         else
0
           self.connection = spec
0
           conn = active_connections[name]
0
@@ -119,6 +117,7 @@ module ActiveRecord
0
 
0
         def clear_entries!(cache, keys, &block)
0
           keys.each do |key|
0
+            next unless cache.has_key?(key)
0
             block.call(key, cache[key])
0
             cache.delete(key)
0
           end

0
@@ -1,4 +1,4 @@
0
-require 'set'
0
+require 'monitor'
0
 
0
 module ActiveRecord
0
   class Base
0
@@ -9,6 +9,15 @@ module ActiveRecord
0
       end
0
     end
0
 
0
+    class NullMonitor
0
+      def synchronize
0
+        yield
0
+      end
0
+    end
0
+
0
+    cattr_accessor :connection_pools_lock, :instance_writer => false
0
+    @@connection_pools_lock = NullMonitor.new
0
+
0
     # Check for activity after at least +verification_timeout+ seconds.
0
     # Defaults to 0 (always check.)
0
     cattr_accessor :verification_timeout, :instance_writer => false
0
@@ -18,8 +27,18 @@ module ActiveRecord
0
     @@connection_pools = {}
0
 
0
     class << self
0
+      def allow_concurrency=(flag)
0
+        if @@allow_concurrency != flag
0
+          if flag
0
+            self.connection_pools_lock = Monitor.new
0
+          else
0
+            self.connection_pools_lock = NullMonitor.new
0
+          end
0
+        end
0
+      end
0
+
0
       # for internal use only
0
-      def active_connections
0
+      def active_connections #:nodoc:
0
         @@connection_pools.inject({}) do |hash,kv|
0
           hash[kv.first] = kv.last.active_connection
0
           hash.delete(kv.first) unless hash[kv.first]
0
@@ -36,22 +55,16 @@ module ActiveRecord
0
 
0
       # Clears the cache which maps classes to connections.
0
       def clear_active_connections!
0
-        clear_cache!(@@connection_pools) do |name, pool|
0
-          pool.clear_active_connections!
0
-        end
0
+        @@connection_pools.each_value {|pool| pool.clear_active_connections! }
0
       end
0
       
0
-      # Clears the cache which maps classes 
0
+      # Clears the cache which maps classes
0
       def clear_reloadable_connections!
0
-        clear_cache!(@@connection_pools) do |name, pool|
0
-          pool.clear_reloadable_connections!
0
-        end
0
+        @@connection_pools.each_value {|pool| pool.clear_reloadable_connections! }
0
       end
0
 
0
       def clear_all_connections!
0
-        clear_cache!(@@connection_pools) do |name, pool|
0
-          pool.disconnect!
0
-        end
0
+        clear_cache!(@@connection_pools) {|name, pool| pool.disconnect! }
0
       end
0
 
0
       # Verify active connections.
0
@@ -59,6 +72,9 @@ module ActiveRecord
0
         @@connection_pools.each_value {|pool| pool.verify_active_connections!}
0
       end
0
 
0
+      synchronize :active_connections, :clear_active_connections!, :clear_reloadable_connections!,
0
+        :clear_all_connections!, :verify_active_connections!, :with => :connection_pools_lock
0
+
0
       private
0
         def clear_cache!(cache, &block)
0
           cache.each(&block) if block_given?
0
@@ -107,7 +123,9 @@ module ActiveRecord
0
           raise AdapterNotSpecified unless defined? RAILS_ENV
0
           establish_connection(RAILS_ENV)
0
         when ConnectionSpecification
0
-          @@connection_pools[name] = ConnectionAdapters::ConnectionPool.new(spec)
0
+          connection_pools_lock.synchronize do
0
+            @@connection_pools[name] = ConnectionAdapters::ConnectionPool.new(spec)
0
+          end
0
         when Symbol, String
0
           if configuration = configurations[spec.to_s]
0
             establish_connection(configuration)
0
@@ -171,5 +189,10 @@ module ActiveRecord
0
       pool.disconnect! if pool
0
       pool.spec.config if pool
0
     end
0
+
0
+    class << self
0
+      synchronize :retrieve_connection, :retrieve_connection_pool, :connected?,
0
+        :remove_connection, :with => :connection_pools_lock
0
+    end
0
   end
0
 end

0
@@ -11,11 +11,15 @@ unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name
0
     def setup
0
       @connection = ActiveRecord::Base.remove_connection
0
       @connections = []
0
+      @allow_concurrency = ActiveRecord::Base.allow_concurrency
0
+      ActiveRecord::Base.allow_concurrency = true
0
     end
0
 
0
     def teardown
0
       # clear the connection cache
0
       ActiveRecord::Base.clear_active_connections!
0
+      # set allow_concurrency to saved value
0
+      ActiveRecord::Base.allow_concurrency = @allow_concurrency
0
       # reestablish old connection
0
       ActiveRecord::Base.establish_connection(@connection)
0
     end