Ivar += in MRI is thread safe

dd1aa738 · Akira Matsuda · 5e0ef9ca · dd1aa738
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb ...ve_record/connection_adapters/abstract/connection_pool.rb +5 -1

未找到文件。
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -835,7 +835,11 @@ def checkout_for_exclusive_access(checkout_timeout)
        end

        def with_new_connections_blocked
-          synchronize do
+          if defined?(JRUBY_VERSION)
+            synchronize do
+              @threads_blocking_new_connections += 1
+            end
+          else
            @threads_blocking_new_connections += 1
          end