[前][次][番号順一覧][スレッド一覧]

ruby-changes:58730

From: Koichi <ko1@a...>
Date: Tue, 12 Nov 2019 10:08:00 +0900 (JST)
Subject: [ruby-changes:58730] fef4370b40 (master): check more.

https://git.ruby-lang.org/ruby.git/commit/?id=fef4370b40

From fef4370b409c990228cded2c425a6afb3bec2906 Mon Sep 17 00:00:00 2001
From: Koichi Sasada <ko1@a...>
Date: Tue, 12 Nov 2019 09:48:49 +0900
Subject: check more.


diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index ccbb2c0..d2bcc50 100644
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -167,9 +167,9 @@ module Kernel https://github.com/ruby/ruby/blob/trunk/lib/rubygems/core_ext/kernel_require.rb#L167
 
     raise load_error
   ensure
-    if !monitor_owned && RUBYGEMS_ACTIVATION_MONITOR.mon_owned?
+    if monitor_owned != (ow = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?)
       STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $!
-      raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR is holding."
+      raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before #{monitor_owned} -> after #{ow}"
     end
   end
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]