Add null check for the return value of ReferenceQueue#remove() (#7304)

open-telemetry · Nov 25, 2022 · 7e2924c · 7e2924c
1 parent 6ea1c24
commit 7e2924c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...ntelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java b/...ntelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java
@@ -258,7 +258,9 @@ static void runCleanup() {
     try {
       while (!Thread.interrupted()) {
         Reference<?> reference = REFERENCE_QUEUE.remove();
-        removeWeakKey((WeakKey<?>) reference);
+        if (reference != null) {
+          removeWeakKey((WeakKey<?>) reference);
+        }
       }
     } catch (InterruptedException ignored) {
       // do nothing