diff options
| author | raggi <jftucker@gmail.com> | 2010-11-25 06:21:55 +0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-11-25 06:47:27 +0800 |
| commit | d8692985feb4db9fe8d113549535b658fe6058e5 (patch) | |
| tree | 52b933abd0b4ccd4725e30bc9ce55b8c84b6501c /activerecord | |
| parent | ee74f2c6238dbaca00e9b667c3c239f3cae8aca5 (diff) | |
| download | rails-d8692985feb4db9fe8d113549535b658fe6058e5.tar.gz rails-d8692985feb4db9fe8d113549535b658fe6058e5.tar.bz2 rails-d8692985feb4db9fe8d113549535b658fe6058e5.zip | |
Don't depend on rubygems loading thread (for Mutex)
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index ca9314ec99..cffa2387de 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -1,3 +1,4 @@ +require 'thread' require 'monitor' require 'set' require 'active_support/core_ext/module/synchronization' diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index 4ddcdc010b..f9678cb0c5 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -1,3 +1,4 @@ +require 'thread' require "cases/helper" require 'models/person' require 'models/reader' |