diff options
Diffstat (limited to 'lib/rubygems/core_ext')
| -rw-r--r-- | lib/rubygems/core_ext/kernel_require.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 944bb93bb6..ccbb2c0472 100644 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -32,6 +32,7 @@ module Kernel # that file has already been loaded is preserved. def require(path) + monitor_owned = RUBYGEMS_ACTIVATION_MONITOR.mon_owned? RUBYGEMS_ACTIVATION_MONITOR.enter path = path.to_path if path.respond_to? :to_path @@ -166,7 +167,7 @@ module Kernel raise load_error ensure - if RUBYGEMS_ACTIVATION_MONITOR.mon_owned? + if !monitor_owned && RUBYGEMS_ACTIVATION_MONITOR.mon_owned? STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $! raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR is holding." end |