archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[rubygems/rubygems] LoadError#path on the caught exception does not need to protect

Browse source 
a31f5d1a18
This commit is contained in:
Nobuyoshi Nakada 2023-01-05 11:52:14 +09:00 • committed by git
parent 1a1b653c9c
commit 55aa1a206c
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,17 +147,17 @@ module Kernel
RUBYGEMS_ACTIVATION_MONITOR.exit
return gem_original_require(path)
rescue LoadError => load_error
RUBYGEMS_ACTIVATION_MONITOR.enter
if load_error.path == path
RUBYGEMS_ACTIVATION_MONITOR.enter
begin
if load_error.path == path and Gem.try_activate(path)
require_again = true
begin
require_again = Gem.try_activate(path)
ensure
RUBYGEMS_ACTIVATION_MONITOR.exit
end
ensure
RUBYGEMS_ACTIVATION_MONITOR.exit
end
return gem_original_require(path) if require_again
return gem_original_require(path) if require_again
end
raise load_error
ensure