kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

reduce the number of times current_connection_id is called in with_connection()

Browse source
This commit is contained in:
Aaron Patterson 2010-08-06 16:38:53 -07:00
parent e1596be323
commit 334452098e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
View file

@ -103,8 +103,8 @@ module ActiveRecord
# Signal that the thread is finished with the current connection.
# #release_connection releases the connection-thread association
# and returns the connection to the pool.
def release_connection
conn = @reserved_connections.delete(current_connection_id)
def release_connection(with_id = current_connection_id)
conn = @reserved_connections.delete(with_id)
checkin conn if conn
end
@ -112,10 +112,11 @@ module ActiveRecord
# exists checkout a connection, yield it to the block, and checkin the
# connection when finished.
def with_connection
fresh_connection = true unless @reserved_connections[current_connection_id]
connection_id = current_connection_id
fresh_connection = true unless @reserved_connections[connection_id]
yield connection
ensure
release_connection if fresh_connection
release_connection(connection_id) if fresh_connection
end
# Returns true if a connection has already been opened.