diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 13:50:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 13:50:25 -0700 |
| commit | 92c29d82eb2f323bb1338a039229a66057a7d137 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | |
| parent | f851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff) | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| download | rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2 rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip | |
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 8f1506befa..cfe1892d78 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -147,7 +147,7 @@ module ActiveRecord # this method must only be called while holding connection pool's mutex def lease if in_use? - msg = "Cannot lease connection, " + msg = "Cannot lease connection, ".dup if @owner == Thread.current msg << "it is already leased by the current thread." else |