archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 05:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Only enabled mon_owned condition with Ruby 2.5+

Browse source
This commit is contained in:
Hiroshi SHIBATA 2019-11-12 15:44:19 +09:00
parent 3bf8ffad71
commit f36a53d038
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rubygems/core_ext/kernel_require.rb
View file

@ -32,7 +32,9 @@ module Kernel
# that file has already been loaded is preserved. # that file has already been loaded is preserved.
def require(path) def require(path)
monitor_owned = RUBYGEMS_ACTIVATION_MONITOR.mon_owned? if RUBYGEMS_ACTIVATION_MONITOR.respond_to?(:mon_owned?)
monitor_owned = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?
end
RUBYGEMS_ACTIVATION_MONITOR.enter RUBYGEMS_ACTIVATION_MONITOR.enter
path = path.to_path if path.respond_to? :to_path path = path.to_path if path.respond_to? :to_path
@ -167,9 +169,11 @@ module Kernel
raise load_error raise load_error
ensure ensure
if monitor_owned != (ow = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?) if RUBYGEMS_ACTIVATION_MONITOR.respond_to?(:mon_owned?)
STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $! if monitor_owned != (ow = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?)
raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before #{monitor_owned} -> after #{ow}" STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $!
raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before #{monitor_owned} -> after #{ow}"
end
end end
end end