Make cache and values fully thread-safe

Not locking the default initialization can lead to race-conditions. ref: ruby-concurrency/concurrent-ruby#970 Co-authored-by: Maciej Mensfeld <[email protected]> resolves #8951
puppetlabs · Nov 16, 2023 · bdbd841 · bdbd841
1 parent d3caef9
commit bdbd841
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puppet/settings.rb b/lib/puppet/settings.rb
@@ -146,8 +146,8 @@ def initialize
     @configuration_file = nil
 
     # And keep a per-environment cache
-    @cache = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
-    @values = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
+    @cache = Concurrent::Hash.new { |hash, key| hash.compute_if_absent(key) { Concurrent::Hash.new } }
+    @values = Concurrent::Hash.new { |hash, key| hash.compute_if_absent(key) { Concurrent::Hash.new } }
 
     # The list of sections we've used.
     @used = []