From 6c6d852854ad068acf7d610808ed501b7d13c7f6 Mon Sep 17 00:00:00 2001 From: Guilherme Mansur Date: Tue, 21 May 2019 14:45:29 -0400 Subject: Use Thread.pass instead of Kernel.sleep to trigger race condition --- .../core_ext/module/attribute_accessors_per_thread.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb index 452a456a52..ea4034303e 100644 --- a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb +++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb @@ -53,8 +53,7 @@ class Module EOS end - default_val = (block_given? && default.nil?) ? yield : default - Thread.current["attr_" + name + "_#{sym}"] = default_val unless default_val.nil? + Thread.current["attr_" + name + "_#{sym}"] = default unless default.nil? end end alias :thread_cattr_reader :thread_mattr_reader @@ -97,8 +96,7 @@ class Module EOS end - default_val = (block_given? && default.nil?) ? yield : default - Thread.current["attr_" + name + "_#{sym}"] = default_val unless default_val.nil? + public_send("#{sym}=", default) unless default.nil? end end alias :thread_cattr_writer :thread_mattr_writer @@ -142,9 +140,9 @@ class Module # # Current.new.user = "DHH" # => NoMethodError # Current.new.user # => NoMethodError - def thread_mattr_accessor(*syms, instance_reader: true, instance_writer: true, instance_accessor: true, default: nil, &blk) - thread_mattr_reader(*syms, instance_reader: instance_reader, instance_accessor: instance_accessor, default: default, &blk) - thread_mattr_writer(*syms, instance_writer: instance_writer, instance_accessor: instance_accessor, default: default) + def thread_mattr_accessor(*syms, instance_reader: true, instance_writer: true, instance_accessor: true, default: nil) + thread_mattr_reader(*syms, instance_reader: instance_reader, instance_accessor: instance_accessor, default: default) + thread_mattr_writer(*syms, instance_writer: instance_writer, instance_accessor: instance_accessor) end alias :thread_cattr_accessor :thread_mattr_accessor end -- cgit v1.2.3