aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Christensen <quixoten@gmail.com>2017-04-13 14:05:39 -0600
committerDevin Christensen <quixoten@gmail.com>2017-04-13 14:05:39 -0600
commit47d678d9b2ab6d3e888691e8327e657ff0b5dcb0 (patch)
tree12fd310b73269bc6ea1571e32676ba9db5e3b233
parent6116d7bc052839646f448b8403a7287f52b97ed7 (diff)
downloadrails-47d678d9b2ab6d3e888691e8327e657ff0b5dcb0.tar.gz
rails-47d678d9b2ab6d3e888691e8327e657ff0b5dcb0.tar.bz2
rails-47d678d9b2ab6d3e888691e8327e657ff0b5dcb0.zip
Fix typos
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb2
-rw-r--r--activerecord/test/cases/connection_pool_test.rb2
2 files changed, 2 insertions, 2 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 3dc265622d..9f660a419d 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -80,7 +80,7 @@ module ActiveRecord
# * private methods that require being called in a +synchronize+ blocks
# are now explicitly documented
class ConnectionPool
- # Threadsafe, fair, FIFO queue. Meant to be used by ConnectionPool
+ # Threadsafe, fair, LIFO queue. Meant to be used by ConnectionPool
# with which it shares a Monitor.
class Queue
def initialize(lock = Monitor.new)
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 46081cc13d..790eed6007 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -203,7 +203,7 @@ module ActiveRecord
end.join
end
- def test_checkout_order_is_fifo
+ def test_checkout_order_is_lifo
conn1 = @pool.checkout
conn2 = @pool.checkout
@pool.checkin conn1