Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 3745

Show
Ignore:
Timestamp:
03/02/06 14:36:06 (3 years ago)
Author:
bitsweat
Message:

Revert allow_concurrency change for better testing. Retrieve_connection in two steps to avoid side-effect bug (yuk).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/lib/active_record/base.rb

    r3728 r3745  
    311311    # Defaults to false. Set to true if you're writing a threaded application. 
    312312    cattr_accessor :allow_concurrency 
    313     @@allow_concurrency = false 
     313    @@allow_concurrency = true 
    314314 
    315315    # Determines whether to speed up access by generating optimized reader 

  • trunk/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

    r3732 r3745  
    5656        else 
    5757          # retrieve_connection sets the cache key. 
    58           active_connections[@active_connection_name] = retrieve_connection 
     58          conn = retrieve_connection 
     59          active_connections[@active_connection_name] = conn 
    5960        end 
    6061      end