Merge pull request #8795 from joshcooper/lexer2_not_a_singleton_11236

(PUP-11236) Work around Thread#thread_variable? bug
puppetlabs · Oct 15, 2021 · 0853161 · 0853161
2 parents d74d117 + 1ce7d99
commit 0853161
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/puppet/concurrent/thread_local_singleton.rb b/lib/puppet/concurrent/thread_local_singleton.rb
@@ -5,10 +5,12 @@ module ThreadLocalSingleton
       def singleton
         key = (name + ".singleton").intern
         thread = Thread.current
-        unless thread.thread_variable?(key)
-          thread.thread_variable_set(key, new)
+        value = thread.thread_variable_get(key)
+        if value.nil?
+          value = new
+          thread.thread_variable_set(key, value)
         end
-        thread.thread_variable_get(key)
+        value
       end
     end
   end