diff options
| -rw-r--r-- | actionpack/test/fixtures/ruby_template.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/ruby_template.rb b/actionpack/test/fixtures/ruby_template.rb index d99833a24d..5097bce47c 100644 --- a/actionpack/test/fixtures/ruby_template.rb +++ b/actionpack/test/fixtures/ruby_template.rb @@ -1,3 +1,2 @@ body = "" body << ["Hello", "from", "Ruby", "code"].join(" ") -body 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 d0ef20f1eb..f42a5df75f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -424,7 +424,6 @@ module ActiveRecord elsif @connections.size < @size checkout_new_connection else - t0 = Time.now @available.poll(@checkout_timeout) end end |