diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-22 15:01:36 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-22 15:01:36 -0300 |
| commit | 7c69e2db36d3892b050ddc248d3ea4d0f4f4f8db (patch) | |
| tree | 3ee71a69a7ed0ec04d8f87f25615e7c610045849 /activerecord/test/cases/connection_adapters | |
| parent | 344ea048659f2ba47012f0330183ea4a96752732 (diff) | |
| download | rails-7c69e2db36d3892b050ddc248d3ea4d0f4f4f8db.tar.gz rails-7c69e2db36d3892b050ddc248d3ea4d0f4f4f8db.tar.bz2 rails-7c69e2db36d3892b050ddc248d3ea4d0f4f4f8db.zip | |
Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"
This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing
changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c.
Conflicts:
activerecord/test/cases/connection_pool_test.rb
Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490)
and we don't have any solution until now. I asked the author to try to
fix it and open a new pull request.
Diffstat (limited to 'activerecord/test/cases/connection_adapters')
| -rw-r--r-- | activerecord/test/cases/connection_adapters/abstract_adapter_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb index 3e3d6e2769..7dc6e8afcb 100644 --- a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb +++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb @@ -36,7 +36,7 @@ module ActiveRecord def test_close pool = ConnectionPool.new(ConnectionSpecification.new({}, nil)) - pool.insert_connection_for_test! adapter + pool.connections << adapter adapter.pool = pool # Make sure the pool marks the connection in use |