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

ruby-changes:58716

From: Hiroshi <ko1@a...>
Date: Mon, 11 Nov 2019 22:15:49 +0900 (JST)
Subject: [ruby-changes:58716] f1f27da6c4 (master): Revert "Try to revert the test failure with Ruby CI"

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

From f1f27da6c457684fdbfc0352297e6847f675ce4c Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 11 Nov 2019 21:49:21 +0900
Subject: Revert "Try to revert the test failure with Ruby CI"

This reverts commit 8b27c23b5d55bd707a89bb5d95d2bdba9e132c1a.

diff --git a/lib/rubygems/core_ext/kernel_gem.rb b/lib/rubygems/core_ext/kernel_gem.rb
index fb3053f..e722225 100644
--- a/lib/rubygems/core_ext/kernel_gem.rb
+++ b/lib/rubygems/core_ext/kernel_gem.rb
@@ -61,9 +61,13 @@ module Kernel https://github.com/ruby/ruby/blob/trunk/lib/rubygems/core_ext/kernel_gem.rb#L61
 
     spec = dep.to_spec
 
-    Gem::LOADED_SPECS_MUTEX.synchronize do
-      spec.activate
-    end if spec
+    if spec
+      if Gem::LOADED_SPECS_MUTEX.owned?
+        spec.activate
+      else
+        Gem::LOADED_SPECS_MUTEX.synchronize { spec.activate }
+      end
+    end
   end
 
   private :gem
-- 
cgit v0.10.2


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

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